Commit graph

17 commits

Author SHA1 Message Date
Jörg Krause 86abdd895e yajl: remove obsolete patch
Commit 302563539d fixes link with libm for all
targets linking against libyajl{,_s}. This makes patch "0001-cmake-uClibc-Fix
-missing-libm-for-tests" obsolete so it is safe to remove it.

Instead of renumbering all remaining patches the patch defined in YAJL_PATCH
is fetched and put intto the packages directory. Having all the patches in one
places makes the number and order of the patches applied to the package more
clear.

Align patch "0003-Link-with-shared-libyajl-in-a-shared-build" with commit
302563539d and remove linking with libm from
test/api/CMakeLists.txt.

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-04-27 22:49:55 +02:00
Samuel Martin 302563539d package/yajl: fix build when explicit link with libm is needed
This change adds another fix to the yajl build-system code.
This patch checks for isnan function in libc, and if not, it makes sure
libm is passed to the linker flags.

This change fixes build failure looking like:

  make[3]: Entering directory `/home/peko/autobuild/instance-2/output/build/yajl-2.1.0'
  [ 81%] Building C object example/CMakeFiles/parse_config.dir/parse_config.c.o
  ../yajl-2.1.0/lib/libyajl.so.2.1.0: undefined reference to `__isnan'
  ../yajl-2.1.0/lib/libyajl.so.2.1.0: undefined reference to `__isinf'
  collect2: error: ld returned 1 exit status
  make[3]: *** [verify/json_verify] Error 1

Fixes:
  http://autobuild.buildroot.org/results/312/31268e4d20aa34bb90c09aa771b1923f979578ab/
  and many others

Cc: Benoît Mauduit <bmauduit@beneth.fr>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Cc: Jörg Krause <joerg.krause@embedded.rocks>
Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-04-24 23:26:34 +02:00
Jörg Krause 3cfd8bf15c yajl: fix static linking in a parallel build
The yajl build system contains a race condition, which gets triggered by
high BR2_JLEVEL settings - It tries to link the executable gen-extra-close
against the shared libyajl before it is created:

[ 21%] Linking C executable gen-extra-close
[ 26%] Building C object src/CMakeFiles/yajl_s.dir/yajl_buf.c.o
/home/test/autobuild/instance-3/output/host/opt/ext-toolchain/bfin-uclinux/bfin-uclinux/bin/ld.real: cannot find -lyajl

Fix this issue by linking gen-extra-close against the shared library in a shared
build and the static library otherwise.
Apply this to all other build targets from yail who are linking against the
library, too.

Fixes:
http://autobuild.buildroot.net/results/a9b/a9b5209377acb51e69f376e0c008ee71fe00397a/
http://autobuild.buildroot.net/results/55f/55fe22463d49addb42b635d10be5176522f4a561/
http://autobuild.buildroot.net/results/808/808acca0cfed93465845c2aa055a7a4fc56a8a17/
http://autobuild.buildroot.net/results/b92/b92a9c84b71a8a2d022d307245ca6be36a000e6c/
http://autobuild.buildroot.net/results/55d/55df698ab53f7d94235166e8576eb681ed68668e/
.. and more.

Upstream status: Pending
https://github.com/lloyd/yajl/pull/187

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-04-15 20:26:51 +02:00
Maxime Hadjinlian 2cb39521e3 yajl: Bump version to 2.1.0
Remove 0001-math-link.patch as some added code render it useless.
Rework 0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch
because it did not apply anymore.
This patch is already in a PR upstream.

Add 0001-cmake-uClibc-Fix-missing-libm-for-tests.patch, to fix a build
error with uClibc toolchain.
This has been sent upstream:
https://github.com/lloyd/yajl/pull/184

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-02-17 12:10:58 +01:00
Jörg Krause b18e4b5849 package/yajl: add patch to fix static build issue
mpd's plugin soundcloud requires yajl. In static build context yajl library is
named yajl_s so linking against yajl fails:
  /bin/ld: cannot find -lyajl

Use a pull request patch [1] to let the shared and the static library
have the same name. They will be differentiated by the extension (.so or .a).

Fixes:
http://autobuild.buildroot.net/results/5ac/5acba9b0ed852512fc88e83973a3b5389e6d54be/
http://autobuild.buildroot.net/results/739/73934ad67efa121fedeaa03fdad290aa63f1485e/

[1] https://github.com/lloyd/yajl/pull/174

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-11-22 10:33:30 +01:00
Jörg Krause 2b88f14fdc package/yajl: add hash
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-11-22 10:33:24 +01:00
Peter Korsgaard 298cd8eaa2 package/*: rename patches according to the new policy
Autogenerated from rename-patch.py (http://patchwork.ozlabs.org/patch/403345)

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-02-03 14:52:56 +01:00
Samuel Martin 022a48280a package/yajl: fix static link
- disable shared object build when BR2_PREFER_STATIC_LIB is set

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-08-31 22:26:31 +02:00
Samuel Martin 4a0dfea9c2 package/yajl: add sequence number in patch names
Also remove the package version from the patch names.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-08-31 22:26:18 +02:00
Mischa Jonker e5c392830e packages: convert Github http:// users to the github helper
[Thomas: taken from Mischa original github patch.]

Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-06 22:38:26 +01:00
Marek Belisko c2d525e82d Download packages from github in tar.gz format instead git format.
Verified way how to get packages from github by version or sha1
(it's enough to use first 7 characters from SHA1):
1. by sha1
FOO_VERSION = 1234567
FOO_SITE = http://github.com/user/package/tarball/branch

2. by version
FOO_VERSION = v1.0
FOO_SITE = http://github.com/user/package/tarball/$(FOO_VERSION)

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-08 21:21:00 +02:00
Simon Dawson d753161efb yajl: add license information
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-21 12:41:02 +02:00
Arnout Vandecappelle (Essensium/Mind) e1502ebc0c all packages: rename XXXTARGETS to xxx-package
Also remove the redundant $(call ...).

This is a purely mechanical change, performed with
find package linux toolchain boot -name \*.mk | \
  xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \
               -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \
               -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-17 20:23:05 +02:00
Peter Korsgaard 01e5bee40f yajl: bump version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-01-25 12:03:10 +01:00
Thomas Petazzoni 9e4aeb3c2b package: remove useless arguments from CMAKETARGETS
Thanks to the pkgparentdir and pkgname functions, we can rewrite the
GENTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-29 23:14:34 +02:00
Peter Korsgaard 489692fcde yajl: fix link issue on uClibc
We need to link with -lm for isnan() / isinf().

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-06-22 17:08:55 +02:00
Peter Korsgaard a9f637383d package: add yajl
yajl is Yet Another JSON Library.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-06-21 17:13:20 +02:00