diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-05 21:19:09 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-05 21:19:09 +0100 |
| commit | 0d26df21995dc2f25041974fb6faf3ec31be6467 (patch) | |
| tree | 5c7d127a7440047678be887af89ad2c4029f7b92 /package/glib/Makefile | |
| parent | da41715f82af9f47cfe64a5c71fb998ba3ebc335 (diff) | |
| parent | c60450e51bf32ef6993ece3496cd8cdcb93b8e04 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/glib/Makefile')
| -rw-r--r-- | package/glib/Makefile | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index 23d0230e5..87fd9d50a 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -5,13 +5,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib PKG_VERSION:= 2.28.1 +PKG_RELEASE:= 5 PKG_EXTRAVER:= 2.28 -PKG_RELEASE:= 4 PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs -PKG_DEPENDS:= libiconv libpthread -PKG_BUILDDEP:= gettext-tiny-host gettext-tiny libiconv dbus glib-host +PKG_DEPENDS:= libpthread +PKG_BUILDDEP:= gettext-tiny-host gettext-tiny libiconv-tiny-host +PKG_BUILDDEP:= libiconv-tiny glib-host zlib PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/ PKG_NOPARALLEL:= 1 @@ -27,12 +28,11 @@ include ${TOPDIR}/mk/package.mk $(eval $(call HOST_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) -CONFIGURE_ARGS+= --enable-debug=no \ - --disable-mem-pools \ +CONFIGURE_ARGS+= --disable-mem-pools \ --disable-rebuilds \ --disable-fam \ - --with-libiconv=gnu \ --with-threads=posix CONFIGURE_ENV+= glib_cv_long_long_format=ll \ glib_cv_stack_grows=no \ @@ -42,18 +42,8 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \ ac_cv_func_posix_getgrgid_r=yes HOST_CONFIGURE_ARGS+= --prefix=$(HOST_WRKINST)/usr \ - --with-libiconv=gnu \ - --enable-debug=no \ --disable-fam -glib-hostinstall: - $(INSTALL_BIN) ${HOST_WRKINST}/usr/bin/glib-compile-schemas \ - ${STAGING_HOST_DIR}/usr/bin - $(INSTALL_BIN) ${HOST_WRKINST}/usr/bin/glib-genmarshal \ - ${STAGING_HOST_DIR}/usr/bin - $(INSTALL_BIN) ${HOST_WRKINST}/usr/bin/glib-mkenums \ - ${STAGING_HOST_DIR}/usr/bin - glib-install: ${INSTALL_DIR} ${IDIR_GLIB}/usr/lib ${CP} ${WRKINST}/usr/lib/libgio*.so* ${IDIR_GLIB}/usr/lib |