summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2019-09-12 13:24:45 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2019-10-08 10:15:34 +0200
commitadc98ce8df321ed0c57c226f2b4e67c60477f20f (patch)
tree2931e5cc2df0faa7c0e9272101d7a7a6fda8451b
parent45dd98b19275b6c01660830cc3a0a05ef8e3e1d9 (diff)
glib: fix compile
-rw-r--r--package/glib/Makefile2
-rw-r--r--package/glib/patches/patch-configure11
2 files changed, 1 insertions, 12 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile
index a90f8f08d..5f088d194 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -11,7 +11,7 @@ PKG_HASH:= 40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d
PKG_DESCR:= low-level core library that forms the basis of gtk+
PKG_SECTION:= libs/misc
PKG_DEPENDS:= libpcre zlib
-PKG_BUILDDEP:= glib-host libffi zlib dbus pcre
+PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre
HOST_BUILDDEP:= pkgconf-host libiconv-host libffi-host python2-host gettext-host util-linux-host
PKG_NEEDS:= threads intl iconv
PKG_URL:= http://www.gtk.org/
diff --git a/package/glib/patches/patch-configure b/package/glib/patches/patch-configure
deleted file mode 100644
index e7dea094f..000000000
--- a/package/glib/patches/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
-- glib-2.48.2.orig/configure 2016-08-17 18:37:42.000000000 +0200
-+++ glib-2.48.2/configure 2017-12-14 14:37:31.000000000 +0100
-@@ -6027,7 +6027,7 @@ if test "x$glib_have_cocoa" = "xyes"; th
-
- $as_echo "#define HAVE_COCOA 1" >>confdefs.h
-
-- COCOA_LIBS="-Wl,-framework,Foundation"
-+ COCOA_LIBS="-Wl,-framework,Foundation,-framework,Cocoa"
- LDFLAGS="$LDFLAGS $COCOA_LIBS"
-
- osx_version=`sw_vers -productVersion`