Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 11 years ago
parent
commit
361225c8f0

+ 2 - 1
mk/pkg-bottom.mk

@@ -151,7 +151,8 @@ endif
 	done
 	@for a in ${WRKINST}/usr/lib/pkgconfig/*.pc; do \
 		[[ -e $$a ]] || continue; \
-		sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," $$a > \
+		sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," \
+		    -e "s,^prefix = .*,prefix = ${STAGING_TARGET_DIR}/usr," $$a > \
 		${STAGING_DIR}/usr/lib/pkgconfig/$$(basename $$a); \
 	done
 ifeq (,$(filter noremove,${PKG_OPTS}))

+ 11 - 0
package/glib/patches/patch-gio_gnetworkmonitor_c

@@ -0,0 +1,11 @@
+--- glib-2.38.2.orig/gio/gnetworkmonitor.c	2013-10-25 17:58:38.000000000 +0200
++++ glib-2.38.2/gio/gnetworkmonitor.c	2014-01-10 19:31:33.528843420 +0100
+@@ -18,6 +18,8 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include <string.h>
++
+ #include "config.h"
+ #include "glib.h"
+ #include "glibintl.h"

+ 10 - 0
package/glib/patches/patch-gio_gnetworkmonitornetlink_c

@@ -0,0 +1,10 @@
+--- glib-2.38.2.orig/gio/gnetworkmonitornetlink.c	2013-11-12 06:30:22.000000000 +0100
++++ glib-2.38.2/gio/gnetworkmonitornetlink.c	2014-01-10 19:31:44.888881617 +0100
+@@ -20,6 +20,7 @@
+ 
+ #include "config.h"
+ 
++#include <string.h>
+ #include <errno.h>
+ #include <unistd.h>
+