diff options
| author | Matt Messier <mmessier@grapetv.org> | 2007-05-15 03:42:15 -0400 |
|---|---|---|
| committer | Matt Messier <mmessier@grapetv.org> | 2007-05-15 03:42:15 -0400 |
| commit | 64d0bdba1149a78a1fab7efaac26a45ea719230e (patch) | |
| tree | 7b53eedb80604ec461b7d7f35cee7bf964c9183d | |
| parent | d90df04ae2c5283649101cb08e041e277a335274 (diff) | |
| download | xine-lib-64d0bdba1149a78a1fab7efaac26a45ea719230e.tar.gz xine-lib-64d0bdba1149a78a1fab7efaac26a45ea719230e.tar.bz2 | |
Mac OS X universal build fixes
-- Set -isysroot in CFLAGS and -syslibroot in LDFLAGS early
-- Patch libtool's sys_lib_search_path_spec to not search /usr/lib, et al.,
and instead search /Developer/SDKs/MacOSX10.4u.sdk/usr/lib so that it'll
find universal versions of stuff, libiconv.dylib in particular. There's
a libiconv.la file hanging around in /usr/lib that breaks everything
otherwise.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | m4/macosx.m4 | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 2511e5dda..24dbaf2e9 100644 --- a/configure.ac +++ b/configure.ac @@ -1202,7 +1202,11 @@ dnl there have no trailing slash. dnl --------------------------------------------- dnl Note: Brackets [] must be doubled as they are treated as m4 macro quotes. -cat libtool | sed -e '/sys_lib_search_path_spec=/s/\/\([[ "]]\)/\1/g' > libtool.tmp +if test x"$enable_macosx_universal" = x"no"; then + cat libtool | sed -e '/sys_lib_search_path_spec=/s/\/\([[ "]]\)/\1/g' > libtool.tmp +else + cat libtool | sed -e 's,sys_lib_search_path_spec=.*$,sys_lib_search_path_spec=\"/Developer/SDKs/MacOSX10.4u.sdk/usr/lib\",' > libtool.tmp +fi mv -f libtool.tmp libtool chmod +x libtool diff --git a/m4/macosx.m4 b/m4/macosx.m4 index 8a66c49b9..0151b41e9 100644 --- a/m4/macosx.m4 +++ b/m4/macosx.m4 @@ -18,9 +18,11 @@ AC_DEFUN([MACOSX_UNIVERSAL_BINARIES], [ AC_MSG_ERROR([Universal binaries can only be built on Darwin]) ;; esac + AC_SUBST(UNIVERSAL_ARCHES) + + CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk" + LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" - UNIVERSAL_CFLAGS="$UNIVERSAL_CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk" - UNIVERSAL_LDFLAGS="$UNIVERSAL_LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" if test x"$UNIVERSAL_ARCHES" != x"" ; then # Forcibly disable dependency tracking for Universal builds, because -M # does not work with multiple -arch arguments on the gcc command-line. @@ -38,7 +40,4 @@ AC_DEFUN([MACOSX_UNIVERSAL_BINARIES], [ fi fi AM_CONDITIONAL([MACOSX_UNIVERSAL_BINARY], [test x"$enable_macosx_universal" = x"yes"]) - AC_SUBST(UNIVERSAL_ARCHES) - AC_SUBST(UNIVERSAL_CFLAGS) - AC_SUBST(UNIVERSAL_LDFLAGS) ])dnl MACOSX_UNIVERSAL_BINARIES |