diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2012-03-14 16:56:20 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2012-03-14 16:56:20 +0000 |
| commit | 4e58ec540f4e8b626f977aa9f0b525ddb830826b (patch) | |
| tree | cbe9f8b1e6c51827d65f396983e41e86459e386e /macosx-setup.sh | |
| parent | 1d4f630589e3faa1be659b8eefad9841f588036a (diff) | |
Update to glib 2.31.20.
One patch is not required anymore, since it has been included.
svn path=/trunk/; revision=41546
Diffstat (limited to 'macosx-setup.sh')
| -rwxr-xr-x | macosx-setup.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index 819eab74db..0d9d3c636d 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -18,7 +18,7 @@ # The following libraries are required. # GETTEXT_VERSION=0.18.1.1 -GLIB_VERSION=2.31.8 +GLIB_VERSION=2.31.20 # # pkg-config 0.26 appears to have broken the "we have our own GLib" # stuff, even if you explicitly set GLIB_CFLAGS and GLIB_LIBS. @@ -176,12 +176,7 @@ cd glib-$GLIB_VERSION # script doesn't try to use pkg-config to get the appropriate # CFLAGS and LIBS. # -LIBFFI_CFLAGS="-I/usr/include/ffi" LIBFFI_LIBS="-L/usr/lib" ./configure || exit 1 -# -# Mac OS X on 64-bit platforms provides libiconv, but in a form that -# confuses GLib. -# -patch -p1 < ../../macosx-support-lib-patches/glib-gconvert.patch || exit 1 +LIBFFI_CFLAGS="-I/usr/include/ffi" LIBFFI_LIBS="-lffi" ./configure || exit 1 make -j 3 || exit 1 # Apply patch: we depend on libffi, but pkg-config doesn't get told. patch -p0 <../../macosx-support-lib-patches/glib-pkgconfig.patch || exit 1 |