aboutsummaryrefslogtreecommitdiffstats
path: root/macosx-support-lib-patches
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2011-07-15 21:48:02 +0000
committerGuy Harris <guy@alum.mit.edu>2011-07-15 21:48:02 +0000
commitb273aad66e771590b3e08ae5e0faba57d3d044a3 (patch)
tree62e558c68e260fb1b9140f438361d8274664695d /macosx-support-lib-patches
parent9adf6c20cabd445d28c6f6ad9b71b05b4c48f01d (diff)
Add Joerg Mayer's macos-setup.sh script, modified to add an "x" after
"macos", to fix some bugs, to use "sudo" if necessary when installing, to make the library version numbers variables, and to download the optional libraries, by default, as well. Also add his patches to make GLib build and work. Update README.macos to reflect that. svn path=/trunk/; revision=38053
Diffstat (limited to 'macosx-support-lib-patches')
-rw-r--r--macosx-support-lib-patches/glib-gconvert.patch10
-rw-r--r--macosx-support-lib-patches/glib-pkgconfig.patch10
2 files changed, 20 insertions, 0 deletions
diff --git a/macosx-support-lib-patches/glib-gconvert.patch b/macosx-support-lib-patches/glib-gconvert.patch
new file mode 100644
index 0000000000..fb0aea73b3
--- /dev/null
+++ b/macosx-support-lib-patches/glib-gconvert.patch
@@ -0,0 +1,10 @@
+--- glib-2.29.8/glib/gconvert.c.orig 2011-06-26 14:48:37.000000000 +0200
++++ glib-2.29.8/glib/gconvert.c 2011-06-26 14:49:58.000000000 +0200
+@@ -61,7 +61,7 @@
+ #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)
++#if !(defined(__APPLE__) && defined(__LP64__)) && !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
+ #error GNU libiconv not in use but included iconv.h is from libiconv
+ #endif
diff --git a/macosx-support-lib-patches/glib-pkgconfig.patch b/macosx-support-lib-patches/glib-pkgconfig.patch
new file mode 100644
index 0000000000..37eb2a6862
--- /dev/null
+++ b/macosx-support-lib-patches/glib-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- gobject-2.0.pc.orig 2011-06-26 16:07:00.000000000 +0200
++++ gobject-2.0.pc 2011-06-26 16:07:11.000000000 +0200
+@@ -7,6 +7,6 @@
+ Description: GLib Type, Object, Parameter and Signal Library
+ Requires: glib-2.0,gthread-2.0
+ Version: 2.29.8
+-Libs: -L${libdir} -lgobject-2.0
++Libs: -L${libdir} -lgobject-2.0 -lffi
+ Libs.private: -L/usr/lib
+ Cflags: