diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-22 22:15:59 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-22 22:15:59 +0200 |
| commit | 1d18ffa427852084c6bf378eaa76c2e9116cdea7 (patch) | |
| tree | b9aa383048f908be017cdc260cb60fa3df5699e0 /package/glib/Makefile | |
| parent | f3d0f13c125a7e24dda986656d42b4a28e2f8e70 (diff) | |
| parent | 4f14ea9a70f86fd29c59b617fa1449dd5b2f14ab (diff) | |
some adk devel corrections
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/package.mk
Diffstat (limited to 'package/glib/Makefile')
| -rw-r--r-- | package/glib/Makefile | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index 66e3329c8..4d555f7bf 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,25 +4,28 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.18.1 +PKG_VERSION:= 2.22.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= d53836f7fdd9970d03e255e9d712bd83 +PKG_MD5SUM:= 00eb873975e2ef9361b8177131c7c943 PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs PKG_DEPENDS:= gettext libiconv libpthread PKG_URL:= http://www.gtk.org/ -PKG_SITES:= ftp://ftp.gtk.org/pub/glib/2.18/ +PKG_SITES:= ftp://ftp.gtk.org/pub/glib/2.22/ +ifeq ($(ADK_STATIC),y) +PKG_OPTS:= libonly +endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,GLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TCPPFLAGS+= -I'${STAGING_DIR}/usr/include' -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-debug=no \ --disable-mem-pools \ --disable-rebuilds \ --with-libiconv=gnu \ + --disable-fam \ --with-threads=posix CONFIGURE_ENV+= glib_cv_long_long_format=ll \ glib_cv_stack_grows=no \ @@ -30,8 +33,8 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \ glib_cv_uscore=no \ ac_cv_func_posix_getpwuid_r=yes \ ac_cv_func_posix_getgrgid_r=yes -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +BUILD_STYLE:= auto +INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_GLIB}/usr/lib |