diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:44:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:44:13 +0100 |
| commit | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (patch) | |
| tree | b1f075ce06512879f327e1aa3abc3838b2de0539 /package/glib | |
| parent | 0aabef127155575e8c8d660605f9401ab15356aa (diff) | |
| parent | 87832fb8da02431280c0a1f9c127dd121ddb7b25 (diff) | |
resolve conflict
Diffstat (limited to 'package/glib')
| -rw-r--r-- | package/glib/Makefile | 19 | ||||
| -rw-r--r-- | package/glib/patches/patch-glib_gatomic_c | 10 |
2 files changed, 17 insertions, 12 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index 807303ca1..f98c73cc9 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,15 +4,16 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.27.5 -PKG_RELEASE:= 2 -PKG_MD5SUM:= ad9c80adb624a1ffe3d9753bab8a578a +PKG_VERSION:= 2.28.1 +PKG_EXTRAVER:= 2.28 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs PKG_DEPENDS:= libintl libiconv libpthread PKG_BUILDDEP:= gettext libiconv PKG_URL:= http://www.gtk.org/ -PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/2.27/ +PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/ PKG_SUBPKGS:= GLIB GLIB_DEV PKGSC_GLIB_DEV:= devel @@ -44,15 +45,9 @@ pre-configure: ifneq ($(OStype),Darwin) (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ ./configure --prefix=$(STAGING_HOST_DIR) \ - --with-libiconv=gnu \ - --enable-debug=no \ - --with-threads=posix \ ); - env CFLAGS="-static" LDFLAGS="-static -liconv" ${MAKE} -C ${WRKBUILD}/glib - env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/gthread - env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/gio glib-compile-schemas - env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/gobject glib-genmarshal - $(CP) ${WRKBUILD}/gio/glib-compile-schemas ${STAGING_HOST_DIR}/bin + env CFLAGS="-static" LDFLAGS="-static -liconv" ${MAKE} -C ${WRKBUILD} + $(CP) ${WRKBUILD}/gio/.libs/glib-compile-schemas ${STAGING_HOST_DIR}/bin $(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin ${MAKE} -C ${WRKBUILD} clean endif diff --git a/package/glib/patches/patch-glib_gatomic_c b/package/glib/patches/patch-glib_gatomic_c new file mode 100644 index 000000000..42d41196b --- /dev/null +++ b/package/glib/patches/patch-glib_gatomic_c @@ -0,0 +1,10 @@ +--- glib-2.27.5.orig/glib/gatomic.c 2010-09-05 06:20:56.000000000 +0200 ++++ glib-2.27.5/glib/gatomic.c 2011-02-18 20:52:37.703561782 +0100 +@@ -882,6 +882,7 @@ g_atomic_pointer_compare_and_exchange (v + + #ifdef DEFINE_WITH_MUTEXES + /* We have to use the slow, but safe locking method */ ++#include "gthread.h" + static GMutex *g_atomic_mutex; + + /** |