Browse Source

revert pre-configure changes for Linux build host

Waldemar Brodkorb 14 years ago
parent
commit
afb9908771
1 changed files with 15 additions and 1 deletions
  1. 15 1
      package/glib/Makefile

+ 15 - 1
package/glib/Makefile

@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		glib
 PKG_NAME:=		glib
 PKG_VERSION:=		2.28.1
 PKG_VERSION:=		2.28.1
 PKG_EXTRAVER:=		2.28
 PKG_EXTRAVER:=		2.28
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		9f6e85e1e38490c3956f4415bcd33e6e
 PKG_MD5SUM:=		9f6e85e1e38490c3956f4415bcd33e6e
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
 PKG_SECTION:=		libs
@@ -42,6 +42,20 @@ CONFIGURE_ENV+=		glib_cv_long_long_format=ll \
 			ac_cv_func_posix_getpwuid_r=yes \
 			ac_cv_func_posix_getpwuid_r=yes \
 			ac_cv_func_posix_getgrgid_r=yes
 			ac_cv_func_posix_getgrgid_r=yes
 
 
+pre-configure:
+ifeq ($(OStype),Linux)
+       (cd ${WRKBUILD}; rm -rf config.{cache,status}; \
+               ./configure --prefix=$(STAGING_HOST_DIR) \
+                       --with-libiconv=gnu \
+       )
+       ${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-install:
 glib-install:
 	${INSTALL_DIR} ${IDIR_GLIB}/usr/lib
 	${INSTALL_DIR} ${IDIR_GLIB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libgio*.so* ${IDIR_GLIB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libgio*.so* ${IDIR_GLIB}/usr/lib