diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-24 16:36:52 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-24 16:36:52 +0200 |
| commit | 82cce6038c7fc05bf1107613fc4b5d3ba8aceb83 (patch) | |
| tree | 3ed19c48bfe55c1a95e7e34ec7798fb13a23922f /package/glib/Makefile | |
| parent | 24092f8e8b58464e33d163d8dee9e864895b50a5 (diff) | |
| parent | ba1dbc96f36abce072ac39a33bb0bd85e12a4e97 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/glib/Makefile')
| -rw-r--r-- | package/glib/Makefile | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index 732f2bc0a..fef89ccab 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib PKG_VERSION:= 2.28.1 PKG_EXTRAVER:= 2.28 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs @@ -17,14 +17,14 @@ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/ PKG_NOPARALLEL:= 1 PKG_OPTS:= dev -#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz - ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif +include ${TOPDIR}/mk/host.mk 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})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) @@ -41,19 +41,17 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \ ac_cv_func_posix_getpwuid_r=yes \ ac_cv_func_posix_getgrgid_r=yes +HOST_CONFIGURE_ARGS+= --prefix=$(HOST_WRKINST)/usr \ + --enable-debug=no \ + --disable-fam -pre-configure: -ifeq ($(OStype),Linux) - (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ - ./configure --prefix=$(STAGING_HOST_DIR) \ - ) - ${MAKE} -C ${WRKBUILD} V=1 - $(CP) ${WRKBUILD}/gio/.libs/glib-compile-schemas ${STAGING_HOST_DIR}/bin - $(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin - $(CP) ${WRKBUILD}/gobject/glib-mkenums ${STAGING_HOST_DIR}/bin - ${MAKE} -C ${WRKBUILD} clean -endif - +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 @@ -67,13 +65,9 @@ glib-install: ${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/lib/glib-2.0/include ${CP} ${WRKINST}/usr/lib/glib-2.0/include/glibconfig.h \ ${IDIR_GLIB_DEV}/usr/lib/glib-2.0/include - ${CP} ${WRKINST}/usr/include/* \ - ${IDIR_GLIB_DEV}/usr/include - ${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/lib/pkgconfig - ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ - ${IDIR_GLIB_DEV}/usr/lib/pkgconfig ${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/glib-genmarshal \ ${IDIR_GLIB_DEV}/usr/bin +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk |