| 1 |
radhermit 13/04/30 07:57:59 |
| 2 |
|
| 3 |
Added: dwb-2013.03.30-json-c.patch |
| 4 |
Log: |
| 5 |
Fix compile with >=json-c-0.11 (bug #467940), fix compile on uclibc and other systems without execinfo.h (bug #465170), and add dep on gnutls. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-client/dwb/files/dwb-2013.03.30-json-c.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dwb/files/dwb-2013.03.30-json-c.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/dwb/files/dwb-2013.03.30-json-c.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: dwb-2013.03.30-json-c.patch |
| 16 |
=================================================================== |
| 17 |
--- dwb-2013.03.30/config.mk |
| 18 |
+++ dwb-2013.03.30/config.mk |
| 19 |
@@ -105,8 +105,18 @@ |
| 20 |
$(error Cannot find $(GNUTLS)) |
| 21 |
endif |
| 22 |
|
| 23 |
+# >=json-c-0.11 renamed its library, pc file, and include dir |
| 24 |
+# first check for >=0.11, if it doesn't exist check for <0.11 |
| 25 |
+ifeq ($(shell pkg-config --exists json-c && echo 1), 1) |
| 26 |
+JSONC=json-c |
| 27 |
+else |
| 28 |
ifeq ($(shell pkg-config --exists json && echo 1), 1) |
| 29 |
-LIBS+=$(GNUTLS) |
| 30 |
+JSONC=json |
| 31 |
+endif |
| 32 |
+endif |
| 33 |
+ |
| 34 |
+ifdef JSONC |
| 35 |
+LIBS+=$(JSONC) |
| 36 |
else |
| 37 |
$(error Cannot find json-c) |
| 38 |
endif |
| 39 |
--- dwb-2013.03.30/src/util/Makefile |
| 40 |
+++ dwb-2013.03.30/src/util/Makefile |
| 41 |
@@ -13,7 +13,7 @@ |
| 42 |
TRANSPORT_SECURITY_JSON=transport_security_state_static.json |
| 43 |
TRANSPORT_SECURITY_CERTS=transport_security_state_static.certs |
| 44 |
|
| 45 |
-LIBS=glib-2.0 gnutls json |
| 46 |
+LIBS=glib-2.0 gnutls $(JSONC) |
| 47 |
CFLAGS+=$(shell pkg-config --cflags $(LIBS)) |
| 48 |
LDFLAGS=$(shell pkg-config --libs $(LIBS)) |
Archives