diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-10 20:00:22 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-10 20:00:22 +0100 |
| commit | 361225c8f0951a2c59f00428a9a3317b67993138 (patch) | |
| tree | cb468309da0c97dc7bf26281eafebcef68f6c5a4 | |
| parent | 354324995180697b8c1d12c8060ab4183a7019c8 (diff) | |
| parent | b69662a1ceca6ead237f6d7200885200d36aaf6a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/pkg-bottom.mk | 3 | ||||
| -rw-r--r-- | package/glib/patches/patch-gio_gnetworkmonitor_c | 11 | ||||
| -rw-r--r-- | package/glib/patches/patch-gio_gnetworkmonitornetlink_c | 10 |
3 files changed, 23 insertions, 1 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index dd8e81c41..288616a7c 100644 --- a/mk/pkg-bottom.mk +++ b/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})) diff --git a/package/glib/patches/patch-gio_gnetworkmonitor_c b/package/glib/patches/patch-gio_gnetworkmonitor_c new file mode 100644 index 000000000..dc3964c3e --- /dev/null +++ b/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" diff --git a/package/glib/patches/patch-gio_gnetworkmonitornetlink_c b/package/glib/patches/patch-gio_gnetworkmonitornetlink_c new file mode 100644 index 000000000..25cc24711 --- /dev/null +++ b/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> + |