diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-12 20:05:20 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-12 20:05:20 +0100 |
| commit | 6728f525e16bf83b4dfc374297b194ce2f1e29b0 (patch) | |
| tree | 7aa8b1b424894a876294c043f00ac369881657b3 | |
| parent | 0eae06e5fb400328ae0956aafffcf1b5082c9a15 (diff) | |
do not depend on host glib installation
| -rw-r--r-- | package/glib/Makefile | 24 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 12 |
2 files changed, 23 insertions, 13 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index c8ae30715..3b06f2cb7 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -25,8 +25,8 @@ $(eval $(call PKG_template,GLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_ CONFIGURE_ARGS+= --enable-debug=no \ --disable-mem-pools \ --disable-rebuilds \ - --with-libiconv=gnu \ --disable-fam \ + --with-libiconv=gnu \ --with-threads=posix CONFIGURE_ENV+= glib_cv_long_long_format=ll \ glib_cv_stack_grows=no \ @@ -35,6 +35,28 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \ ac_cv_func_posix_getpwuid_r=yes \ ac_cv_func_posix_getgrgid_r=yes +ifeq ($(ADK_HOST_CYGWIN),y) +EXEEXT:= .exe +endif + +pre-configure: + (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ + env CFLAGS="-static" LDFLAGS="-static" \ + ./configure --prefix=$(STAGING_HOST_DIR) \ + $(CONFIGURE_ARGS) \ + --with-libiconv=no \ + --with-threads=posix \ + --enable-static \ + --disable-shared \ + ); + ${MAKE} -C ${WRKBUILD}/glib + ${MAKE} -C ${WRKBUILD}/gthread + ${MAKE} -C ${WRKBUILD}/gio glib-compile-schemas + ${MAKE} -C ${WRKBUILD}/gobject glib-genmarshal + $(CP) ${WRKBUILD}/gio/glib-compile-schemas ${STAGING_HOST_DIR}/bin + $(CP) ${WRKBUILD}/gobject/glib-genmarshal ${STAGING_HOST_DIR}/bin + ${MAKE} -C ${WRKBUILD} clean + post-install: ${INSTALL_DIR} ${IDIR_GLIB}/usr/lib ${CP} ${WRKINST}/usr/lib/libgio*.so* ${IDIR_GLIB}/usr/lib diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index b08cafc95..a7b3cf492 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -85,11 +85,6 @@ if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then NEED_INTL="$NEED_INTL xkeyboard-config" fi -if [[ -n $ADK_PACKAGE_GLIB ]]; then - NEED_GLIBZWO="$NEED_GLIBZWO glib" - NEED_GETTEXT="$NEED_GETTEXT glib" -fi - if [[ -n $ADK_PACKAGE_LIBPCAP ]]; then NEED_FLEX="$NEED_FLEX libpcap" NEED_BISON="$NEED_BISON libpcap" @@ -269,13 +264,6 @@ if [[ -n $NEED_XKBCOMP ]]; then fi fi -if [[ -n $NEED_GLIBZWO ]]; then - if ! which glib-genmarshal >/dev/null 2>&1; then - echo >&2 You need libglib2.0-dev to build $NEED_GLIBZWO - out=1 - fi -fi - if [[ -n $NEED_RPM ]]; then if ! which rpmbuild >/dev/null 2>&1; then echo >&2 You need rpmbuild to to use $NEED_RPM package backend |