diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-07-09 04:41:34 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-07-09 04:41:34 +0000 |
| commit | ff15b893d8eb858a6a2da1882bb5d8ace9db2b24 (patch) | |
| tree | ee7df2e059fb74cd4de5d661a5af923d9b434e81 /macosx-support-lib-patches | |
| parent | bbf7636e613bd66461ceb05d79c1d97cfe8c65f2 (diff) | |
Use older versions of some libraries, and build 32-bit, when building
for Leopard. Fix some issues that came up with the older versions.
We don't support building *on* Leopard - we check for that up front - so
eliminate some code to handle that.
When uninstalling, check for the installed version by looking at the
name of the -done file, so we don't have to trust the _VERSION settings.
We don't appear to need to build our own versions of libpng or pixman
when building *on* Snow Leopard *for* Leopard.
The libffi configure patch for GLib appears not to be necessary -
perhaps building and installing pkg-config *before* building GLib makes
it no longer necessary - and it doesn't work with older versions of
GLib, so don't apply it.
svn path=/trunk/; revision=50456
Diffstat (limited to 'macosx-support-lib-patches')
| -rw-r--r-- | macosx-support-lib-patches/glib-gconvert.c.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/macosx-support-lib-patches/glib-gconvert.c.patch b/macosx-support-lib-patches/glib-gconvert.c.patch new file mode 100644 index 0000000000..43ac6d5e2f --- /dev/null +++ b/macosx-support-lib-patches/glib-gconvert.c.patch @@ -0,0 +1,13 @@ +--- glib/gconvert.c.dist 2008-09-12 10:55:51.000000000 -0700 ++++ glib/gconvert.c 2013-07-08 17:23:57.000000000 -0700 +@@ -52,7 +52,9 @@ + #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 ++ #if !defined (__APPLE_CC__) && !defined (__LP_64__) ++ #error GNU libiconv not in use but included iconv.h is from libiconv ++ #endif + #endif + + #include "galias.h" |