diff options
Diffstat (limited to 'package/glib')
| -rw-r--r-- | package/glib/Makefile | 20 | ||||
| -rw-r--r-- | package/glib/patches/patch-glib_gconvert_c | 16 | ||||
| -rw-r--r-- | package/glib/patches/patch-ltmain_sh | 11 |
3 files changed, 34 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 diff --git a/package/glib/patches/patch-glib_gconvert_c b/package/glib/patches/patch-glib_gconvert_c new file mode 100644 index 000000000..bd9db0404 --- /dev/null +++ b/package/glib/patches/patch-glib_gconvert_c @@ -0,0 +1,16 @@ +--- glib-2.27.5.orig/glib/gconvert.c 2010-09-13 15:40:53.000000000 +0200 ++++ glib-2.27.5/glib/gconvert.c 2011-01-14 17:17:40.000000000 +0100 +@@ -58,13 +58,6 @@ + + #include "glibintl.h" + +-#if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H) +-#error GNU libiconv in use but included iconv.h not from libiconv +-#endif +-#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) +-#error GNU libiconv not in use but included iconv.h is from libiconv +-#endif +- + + /** + * SECTION:conversions diff --git a/package/glib/patches/patch-ltmain_sh b/package/glib/patches/patch-ltmain_sh new file mode 100644 index 000000000..559afa25c --- /dev/null +++ b/package/glib/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- glib-2.27.5.orig/ltmain.sh 2010-12-06 15:06:25.000000000 +0100 ++++ glib-2.27.5/ltmain.sh 2011-01-14 17:22:21.000000000 +0100 +@@ -5840,7 +5840,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" |