NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3b3b4f2331
kumquat-buildroot/package/json-c/json-c-no-reentrant.patch

45 lines
1.8 KiB
Diff
Raw Normal View History

json-c: fix build when no thread support is available Fixes http://autobuild.buildroot.org/results/1d9a2e44da3aa627265b03763ca324c609c0c61c/build-end.log. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-25 16:13:12 +02:00
Do not pass -D_REENTRANT
This flag is not needed to build this library, and prevents to build
it with toolchains that don't have thread support.
Since the Makefile.in change is a one-liner, we also do it in the
patch to avoid having to autoreconfigure the package.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
bump json-c to 0.10 this patch bumps json-c to version 0.10 and adapts the no-reentrant patch to the new version. Signed-off-by: Andreas Wetzel <andreas.wetzel@nanotronic.ch> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-19 03:07:33 +01:00
Index: b/Makefile.am.inc
json-c: fix build when no thread support is available Fixes http://autobuild.buildroot.org/results/1d9a2e44da3aa627265b03763ca324c609c0c61c/build-end.log. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-25 16:13:12 +02:00
===================================================================
bump json-c to 0.10 this patch bumps json-c to version 0.10 and adapts the no-reentrant patch to the new version. Signed-off-by: Andreas Wetzel <andreas.wetzel@nanotronic.ch> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-19 03:07:33 +01:00
--- a/Makefile.am.inc
+++ b/Makefile.am.inc
@@ -1,2 +1,2 @@
json-c: bump to version 0.11 Bumping this package is needed, because json-c 0.10 has a major defect: it installs a library named libjson.so, which conflicts with the library installed by the libjson package. This has been changed in the upstream json-c 0.11 version, which now installs libjson-c and json-c.pc. It allows to solve the Pulseaudio link problem, which wants to link against json-c but happens to link against libjson when libjson has been compiled and installed after json-c. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-05-09 09:14:24 +02:00
-AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
+AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE
json-c: fix build when no thread support is available Fixes http://autobuild.buildroot.org/results/1d9a2e44da3aa627265b03763ca324c609c0c61c/build-end.log. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-25 16:13:12 +02:00
Index: b/Makefile.in
===================================================================
--- a/Makefile.in
+++ b/Makefile.in
json-c: bump to version 0.11 Bumping this package is needed, because json-c 0.10 has a major defect: it installs a library named libjson.so, which conflicts with the library installed by the libjson package. This has been changed in the upstream json-c 0.11 version, which now installs libjson-c and json-c.pc. It allows to solve the Pulseaudio link problem, which wants to link against json-c but happens to link against libjson when libjson has been compiled and installed after json-c. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-05-09 09:14:24 +02:00
@@ -274,7 +274,7 @@
json-c: fix build when no thread support is available Fixes http://autobuild.buildroot.org/results/1d9a2e44da3aa627265b03763ca324c609c0c61c/build-end.log. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-25 16:13:12 +02:00
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
json-c: bump to version 0.11 Bumping this package is needed, because json-c 0.10 has a major defect: it installs a library named libjson.so, which conflicts with the library installed by the libjson package. This has been changed in the upstream json-c 0.11 version, which now installs libjson-c and json-c.pc. It allows to solve the Pulseaudio link problem, which wants to link against json-c but happens to link against libjson when libjson has been compiled and installed after json-c. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-05-09 09:14:24 +02:00
-AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
+AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE
bump json-c to 0.10 this patch bumps json-c to version 0.10 and adapts the no-reentrant patch to the new version. Signed-off-by: Andreas Wetzel <andreas.wetzel@nanotronic.ch> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-19 03:07:33 +01:00
EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj
SUBDIRS = . tests
json-c: bump to version 0.11 Bumping this package is needed, because json-c 0.10 has a major defect: it installs a library named libjson.so, which conflicts with the library installed by the libjson package. This has been changed in the upstream json-c 0.11 version, which now installs libjson-c and json-c.pc. It allows to solve the Pulseaudio link problem, which wants to link against json-c but happens to link against libjson when libjson has been compiled and installed after json-c. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-05-09 09:14:24 +02:00
lib_LTLIBRARIES = libjson-c.la $(am__append_1)
Index: b/tests/Makefile.in
===================================================================
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -228,7 +228,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
+AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE
LIBJSON_LA = $(top_builddir)/libjson-c.la
test1_LDADD = $(LIBJSON_LA)
test1Formatted_LDADD = $(LIBJSON_LA)
Reference in New Issue Copy Permalink