Commit Graph

30 Commits

Author SHA1 Message Date
Thomas Petazzoni
69182cb65a czmq: fix build with glibc 2.24
czmq uses readdir_r(), which has been marked as deprecated in glibc
2.24, and czmq uses -Werror which causes the warning to be turned into
an error that aborts the build.

This commit fixes that by removing -Werror. Long-term, we might want
to upgrade czmq to a newer version, since they've removed the use of
readdir_r() in commit 2594d406d8ec6f54e54d7570d7febba10a6906b2. But
getting rid of -Werror is anyway always a good idea in Buildroot.

Fixes:

  http://autobuild.buildroot.net/results/f6e4b8ed8571fdcf30eecae121dd11dfdef50799

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-11-05 15:37:21 +01:00
Bernd Kuhls
1d8a69d864 package/czmq: bump version
Needed for zyre bump:
https://github.com/zeromq/zyre/issues/442#issuecomment-189127583

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-06-05 22:00:34 +02:00
Jörg Krause
4cd669ff93 package/czmq: fix static linking
Currently, building czmq statically fails for some architectures with undefined
references to the math library:
  /usr/powerpc-buildroot-linux-uclibc/sysroot/usr/lib/libstdc++.a(compatibility-ldbl.o): In function `std::tr1::hash<long double>::operator()(long double) const':
  compatibility-ldbl.cc:(.text._ZNKSt3tr14hashIeEclEe+0x3c): undefined reference to `frexpl'

It turns out that this is actually a problem with libstdc++. Depending on the
arch, some functions will be in compatibility-ldbl.o. If you use any of these
functions, that file will be linked in. And when that file is linked in, all
the _other_ functions, which you actually don't use, are also linked in. And
one of these functions is the template function hash<long double>::operator(),
which uses frexpl.

Requiring czmq to link with -lm is a bit weird, given that neither itself,
nor any of its dependencies really need it...

So ideally it should be fixed in libstdc++ itself. However, as upstream
accepted a patch to link with -lm, we use this patch to fix static linking.

Fixes:
http://autobuild.buildroot.net/results/206/2061238affb685db998100a56c6571538d089a5b/
http://autobuild.buildroot.net/results/caf/caf002d213c9dd09df07858c5c199411ca8ddfa3/
http://autobuild.buildroot.net/results/568/568ac92d2f6d0604b9bf354ea9dca0a7cb5341f6/
http://autobuild.buildroot.net/results/945/9452982fc14f579c61b45a1a189db5f89aab3b80/

Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-06 15:59:46 +01:00
Jörg Krause
be26cd1470 package/czmq: add hash file
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-06 13:23:23 +01:00
Yann E. MORIN
5aae95764d package/czmq: bump version
Drop the patch that no longer applies, and has instead been done
differently by upstream.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-08-08 12:40:22 +02:00
Peter Korsgaard
daa8485bc1 czmq: needs host-pkgconf
It uses pkg-config to find zeromq, so ensure it is available.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-05-13 09:17:49 +02:00
Peter Korsgaard
878b9aaba9 Revert "czmq: unbreak static linking"
This reverts commit aa5254f1a2.

Now that zeromq's pkg-config file is fixed, we no longer need this
workaround for static linking.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-05-13 09:16:27 +02:00
Peter Korsgaard
aa5254f1a2 czmq: unbreak static linking
Fixes:
http://autobuild.buildroot.net/results/faf/faf0bb00fccb1350afaef55f6cf14c11a5f5dc3c/
http://autobuild.buildroot.net/results/8d2/8d279baa4c8bffbb01f897119092c7b736942df4/
http://autobuild.buildroot.net/results/4d3/4d3dea604da9a5a1e7fe20548813f8de474ae33f/
http://autobuild.buildroot.net/results/fd6/fd602617839817352763e51754553960b7f795ac/

And many more.

Zeromq uses C++, but czmq forgets to explicitly link with libstdc++
(or use g++ to link), breaking static linking.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-05-12 20:43:12 +02:00
Gustavo Zacarias
79ce08bbdc packages: remove non-IPv6 dependencies and tweaks
Now that IPv6 is mandatory remove package dependencies and conditionals
for it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-22 23:06:35 +02:00
Gustavo Zacarias
f4716f79a0 packages: remove (non-)lfs dependencies and tweaks
Now that largefile is mandatory removes package dependencies and
conditionals.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-01 22:47:22 +02:00
Romain Naour
5926d871a0 package/czmq: fix discovery of libzmq for static build
Backport and rebase a patch from upstream:
313714f8b7

Also, remove the fix in czmq.mk for static build.

Fixes:
http://autobuild.buildroot.net/results/ec4/ec414b52f9cdd8d7d365283e21479519e63c7d97/

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-15 14:37:12 +01:00
Thomas Petazzoni
665e13c85e Rename BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS
Since a while, the semantic of BR2_PREFER_STATIC_LIB has been changed
from "prefer static libraries when possible" to "use only static
libraries". The former semantic didn't make much sense, since the user
had absolutely no control/idea of which package would use static
libraries, and which packages would not. Therefore, for quite some
time, we have been starting to enforce that BR2_PREFER_STATIC_LIB
should really build everything with static libraries.

As a consequence, this patch renames BR2_PREFER_STATIC_LIB to
BR2_STATIC_LIBS, and adjust the Config.in option accordingly.

This also helps preparing the addition of other options to select
shared, shared+static or just static.

Note that we have verified that this commit can be reproduced by
simply doing a global rename of BR2_PREFER_STATIC_LIB to
BR2_STATIC_LIBS plus adding BR2_PREFER_STATIC_LIB to Config.in.legacy.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
2014-12-11 22:48:13 +01:00
Baruch Siach
e9201d558f czmq: fix static build
libstdc++ may also need -lm.

Fixes:
http://autobuild.buildroot.net/results/aab/aab80285c54641fd7c217cdd45c4593e5c3a66c5/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-11-24 22:27:07 +01:00
Baruch Siach
2b88b05443 czmq: fix static build
czmq configure script uses gcc to test zmq linking so libstdc++ is not added
automatically. Do this manually.

Fixes:
http://autobuild.buildroot.net/results/7b7/7b7f7614206cf9b8fef48f49cb060eca356d4949/
http://autobuild.buildroot.net/results/b3a/b3abff021d23ef0f685a44901b6041ba45bd35d7/
http://autobuild.buildroot.net/results/1f0/1f033d04231c5f058513cbca0d437b96260fbd7a/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-11-21 10:37:14 +01:00
Maxime Hadjinlian
7f3387d04d czmq: bump version
Remove patch as it was merged upstream.

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-27 01:11:06 +01:00
Thomas Petazzoni
116733c6c2 czmq: add patch to fix build issue with recent glibc
glibc 2.20 is now warning when _BSD_SOURCE is used (as it's replaced
by _DEFAULT_SOURCE), and czmq has the bad idea of forcing the usage of
-Werror, causing build issues with the recent NIOS II toolchain based
on glibc 2.20.

This commit adds a patch to czmq to fix that. The patch has been
submitted upstream.

Fixes:

  http://autobuild.buildroot.org/results/64a/64a7eef2155248146e7f3a55e85fe60bc5b67791/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-09-10 09:40:15 +02:00
Thomas De Schampheleire
ce6b23a2ee github packages: use tarball download via github helper iso git clone
Tarball download from github is preferred, because:
- download size is smaller
- git clone may be blocked in some corporate environments

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-05 21:54:28 +02:00
Baruch Siach
948b963d1b czmq: needs MMU
Fixes:
http://autobuild.buildroot.net/results/6dd/6dd6954e5ab8c422070e53b0e616e1b1a821c626/

Also, remove the Blackfin toolchain dependencies as these are redundant now
since Blackfin is a noMMU arch.

[Peter: propagate to filemq as well]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-05 08:44:39 +02:00
Peter Korsgaard
6f64cd187c czmq: fix license after version bump
czmq is now under the MPLv2.0 license. For more details, see
https://github.com/zeromq/czmq/commit/eabe063c2588cde0af90e

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-04-26 20:51:33 +02:00
Simon Dawson
75a8d8aca5 czmq: bump version to v2.2.0
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-04-26 11:38:04 +02:00
Simon Dawson
2d1ff9fc83 czmq: bump git snapshot
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-01-03 20:47:06 +01:00
Thomas De Schampheleire
be084204eb Config.in files: add missing dependencies to toolchain option comments
When a package A depends on config option B and toolchain option C, then
the comment that is given when C is not fulfilled should also depend on B.
For example:

config BR2_PACKAGE_A
	depends on BR2_B
	depends on BR2_LARGEFILE
	depends on BR2_WCHAR

comment "A needs a toolchain w/ largefile, wchar"
	depends on !BR2_LARGEFILE || !BR2_WCHAR

This comment should actually be:

comment "A needs a toolchain w/ largefile, wchar"
	depends on BR2_B
	depends on !BR2_LARGEFILE || !BR2_WCHAR

or if possible (typically when B is a package config option declared in that
same Config.in file):

if BR2_B

comment "A needs a toolchain w/ largefile, wchar"
	depends on !BR2_LARGEFILE || !BR2_WCHAR

[other config options depending on B]

endif

Otherwise, the comment would be visible even though the other dependencies
are not met.

This patch adds such missing dependencies, and changes existing such
dependencies from
  depends on BR2_BASE_DEP && !BR2_TOOLCHAIN_USES_GLIBC
to
  depends on BR2_BASE_DEP
  depends on !BR2_TOOLCHAIN_USES_GLIBC
so that (positive) base dependencies are separate from the (negative)
toolchain dependencies. This strategy makes it easier to write such comments
(because one can simply copy the base dependency from the actual package
config option), but also avoids complex and long boolean expressions.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 (untested)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-10 23:59:57 +01:00
Thomas De Schampheleire
e6ea6b7865 git packages: use full revision hash
There is no benefit in using the shortened git revision hash. On the
contrary: the shorter the hash, the higher the risk of having collisions
with another commit.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-11-02 16:16:54 +01:00
Axel Lin
a2ffd68492 cppzmq/czmq: Update comment for needs threads support
Comment 7e37d235f "zeromq: needs threads" adds BR2_TOOLCHAIN_HAS_THREADS
dependency but forgot to add corresponding comment for cppzmq and czmq. Fix it.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-11-01 16:39:11 +01:00
Thomas De Schampheleire
66bb10b7b0 Config.in files: unify comments of toolchain option dependencies
This patch lines up the comments in Config.in files that clarify which
toolchain options the package depends on.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-14 22:45:57 +02:00
Alexandre Belloni
8dfd59d114 Normalize separator size to 80
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 22:30:24 +02:00
Thomas Petazzoni
200b2dfa6d czmq: prevent selection when ADI Blackfin external toolchains are used
czmq fails to build with the Blackfin external toolchains provided by
Analog Devices, because their uClibc configuration doesn't include
AI_ADDRCONFIG. In order to prevent such build failures to happen, we
simply prevent the selection of czmq or one of its reverse
dependencies when such toolchains are used.

This fixes:

  http://autobuild.buildroot.org/results/821/82140fac4c2a2cef3f38f06cada8f17fd7f0078b/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-05-29 21:20:33 +02:00
Arnout Vandecappelle (Essensium/Mind)
92cd8a5273 czmq: disable asciidoc documentation generation
czmq uses asciidoc for its documentation. asciidoc uses python and import
the unicodedata module, which is not in host-python. So disable asciidoc
entirely.

This doesn't get hit by the autobuilders because they don't have asciidoc
installed in their chroot.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-05-12 21:28:10 +02:00
Gustavo Zacarias
7e37d235f9 zeromq: needs threads
Fixes:
http://autobuild.buildroot.net/results/11a1c085e3f5c490cbf3fec8f26169ade29f7363/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-10 11:46:11 +02:00
Simon Dawson
34c6fc1034 czmq: new package
Signed-off-by: Simon Dawson <spdawson@gmail.com>
[yann.morin.1998@free.fr: create dir as post-patch, not pre-configure]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-03-27 09:42:35 +01:00