diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-08-12 19:32:46 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-08-12 19:32:46 +0000 |
| commit | 9d4ab6a4f49a2e5a5a436f0e35f07858a620ba67 (patch) | |
| tree | 729bdb1387bf763262ab6b41e129e081f8877da5 /macosx-setup.sh | |
| parent | 517ef559c28bbade48bc9b2aec9bbe43610821c5 (diff) | |
Patching configure.in files and regenerating them is a bag of hurt, as
it can depend on, among other things, having the the relevant .pc files
in one of the directories in PKG_CONFIG_PATH. Instead, just don't
request a fat build of PortAudio.
svn path=/trunk/; revision=44457
Diffstat (limited to 'macosx-setup.sh')
| -rwxr-xr-x | macosx-setup.sh | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/macosx-setup.sh b/macosx-setup.sh index c16323c567..9a5e956e3a 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -397,28 +397,20 @@ then tar xf $PORTAUDIO_VERSION.tgz || exit 1 cd portaudio # - # Fix some problems with Xcode 4 and PortAudio's configure - # script - patch the configure script and rebuild it. + # Un-comment an include that's required on Lion. # - # "autoreconf -if" is what the PortAudio README.configure.txt - # file says to use; I'm guessing it's required in order to - # adapt to the libtool *you* have installed rather than the - # one installed on the machine on which the PortAudio tarball - # was built. - # - # However, it appears that, as PortAudio doesn't use - # automake, it removes config.guess and config.sub and - # *doesn't replace them* as it doesn't run "automake --add-missing". - # We therefore do so ourselves. + patch -p0 include/pa_mac_core.h <../../macosx-support-lib-patches/portaudio-pa_mac_core.h.patch # - patch -p0 configure.in <../../macosx-support-lib-patches/portaudio-configure.in.patch - autoreconf -if - automake --add-missing + # Disable fat builds - the configure script doesn't work right + # with Xcode 4 if you leave them enabled, and we don't build + # any other libraries fat (GLib, for example, would be very + # hard to build fat), so there's no advantage to having PortAudio + # built fat. # - # And also un-comment an include that's required on Lion. + # Set the minimum OS X version to 10.4, to suppress some + # deprecation warnings. # - patch -p0 include/pa_mac_core.h <../../macosx-support-lib-patches/portaudio-pa_mac_core.h.patch - ./configure || exit 1 + CFLAGS="-mmacosx-version-min=10.4" ./configure --disable-mac-universal || exit 1 make -j 3 || exit 1 $DO_MAKE_INSTALL || exit 1 cd .. |