diff options
| author | davilla <davilla@4pi.com> | 2011-08-20 02:38:17 -0400 |
|---|---|---|
| committer | davilla <davilla@4pi.com> | 2011-08-20 02:49:53 -0400 |
| commit | e42973d68deacd7ef3dbf094899b8e3b29611cf3 (patch) | |
| tree | 1ecf31c41c0f511201a75cc03faf8a8021d00a2f /tools | |
| parent | b36bd100ce7f89eb29d1634389fffff508cff784 (diff) | |
[osx/ios] fixed libglib-2 depends build
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/darwin/depends/libglib-2/Makefile | 17 | ||||
| -rwxr-xr-x | tools/darwin/depends/libglib-2/glib-genmarshal | bin | 0 -> 31744 bytes |
2 files changed, 13 insertions, 4 deletions
diff --git a/tools/darwin/depends/libglib-2/Makefile b/tools/darwin/depends/libglib-2/Makefile index 1b0decf2e1..e07aad0d14 100644 --- a/tools/darwin/depends/libglib-2/Makefile +++ b/tools/darwin/depends/libglib-2/Makefile @@ -1,5 +1,4 @@ include ../Makefile.include -include ../config.site.mk # lib name, version LIBNAME=glib @@ -12,15 +11,18 @@ BASE_URL=http://ftp.acc.umu.se/pub/gnome/sources/glib/2.24 # configuration settings # convert filenames from locale encoding to UTF-8 #export G_BROKEN_FILENAMES=1 -CONFIGURE=./configure --prefix=$(PREFIX) --build=i686-pc-linux --host=$(HOST) \ +CONFIGURE=./configure --prefix=$(PREFIX) \ --disable-gtk-doc \ + --disable-gtk-doc-html \ + --disable-gtk-doc-pdf \ --disable-man \ glib_cv_stack_grows=no \ - ac_cv_lib_dld_shl_load=yes \ glib_cv_rtldglobal_broken=no \ glib_cv_uscore=no \ + ac_cv_lib_dld_shl_load=yes \ ac_cv_func_posix_getpwuid_r=yes \ - ac_cv_func_posix_getgrgid_r=yes + ac_cv_func_posix_getgrgid_r=yes \ + ac_cv_path_GLIB_GENMARSHAL=`pwd`/../glib-genmarshal LIBDYLIB=$(SOURCE)/.libs/$(LIBNAME).dylib @@ -33,7 +35,14 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE) rm -rf $(SOURCE) $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) echo $(SOURCE) > .gitignore + if test "$(DARWIN)" = "ios"; then \ + sed -i "" -e "s|-framework Carbon| |" "$(SOURCE)/configure"; \ + fi cd $(SOURCE); $(CONFIGURE) + if test "$(DARWIN)" = "ios"; then \ + sed -i "" -e "s|#define HAVE_CARBON 1| |" "$(SOURCE)/config.h"; \ + sed -i "" -e "s|defined(USE_LIBICONV_GNU)|!defined(__APPLE__) \&\& defined(USE_LIBICONV_GNU)|g" "$(SOURCE)/glib/gconvert.c"; \ + fi $(LIBDYLIB): $(SOURCE) make -j 1 -C $(SOURCE) diff --git a/tools/darwin/depends/libglib-2/glib-genmarshal b/tools/darwin/depends/libglib-2/glib-genmarshal Binary files differnew file mode 100755 index 0000000000..50e3d35e5f --- /dev/null +++ b/tools/darwin/depends/libglib-2/glib-genmarshal |