diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 15:34:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 15:34:13 +0100 |
| commit | 902ee7e7b23751ca7a8264d36a837aa4aae12032 (patch) | |
| tree | 56c6b37cd9afd91d176cd75acb77bf32ccd20378 /package/glib/Makefile | |
| parent | 3d45df344602687c8983f5fb609721aa8ca2469f (diff) | |
| parent | 52dbdcd1045c7a8ad96753593540719cff9f8863 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/glib/Makefile')
| -rw-r--r-- | package/glib/Makefile | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index 3b06f2cb7..8dc9c6339 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -35,27 +35,21 @@ 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" \ +ifneq ($(OStype),Darwin) + (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ ./configure --prefix=$(STAGING_HOST_DIR) \ - $(CONFIGURE_ARGS) \ - --with-libiconv=no \ + --enable-debug=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 + env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/gio glib-compile-schemas + env CFLAGS="-static" LDFLAGS="-static" ${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 + $(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin ${MAKE} -C ${WRKBUILD} clean +endif post-install: ${INSTALL_DIR} ${IDIR_GLIB}/usr/lib |