diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-03 00:12:18 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-03 00:12:18 +0000 |
| commit | 5a6aafe41e46b4166f30eaf87edbcb10f167821a (patch) | |
| tree | 5be16940db3489d661646e456f18510f58d37c4c /tools | |
| parent | 6e24e2596bd05f9ca001d83068094eb391ea1fcb (diff) | |
fix up libffi build
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@12157 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/build-gtk-stack | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/build-gtk-stack b/tools/build-gtk-stack index 9c224c19a3..84b1916724 100755 --- a/tools/build-gtk-stack +++ b/tools/build-gtk-stack @@ -306,12 +306,17 @@ tar xf libpng-1.5.10.tar.xz && (cd libpng-1.5.10 && CFLAGS=$GLOBAL_CFLAGS LDFLA tar xf jpegsrc.v8d.tar.gz && (cd jpeg-8d && CFLAGS=$GLOBAL_CFLAGS LDFLAGS="$GLOBAL_LDFLAGS" ./configure $GLOBAL_CONF && make && make install) || die "jpegsrc build failed" tar xf XML-Parser-2.41.tar.gz && (cd XML-Parser-2.41 && unset MACOSX_DEPLOYMENT_TARGET && perl Makefile.PL PREFIX=$PREFIX && make && make install) || die "XML-Parser build failed" tar xf XML-Simple-2.18.tar.gz && (cd XML-Simple-2.18 && unset MACOSX_DEPLOYMENT_TARGET && perl Makefile.PL PREFIX=$PREFIX && make && make install) || die "XML-Simple build failed" + +if uname -a | grep --silent arwin ; then # # libffi has a bug that is caused by it depending on the output format of GNU wc(1) -# it can be avoided by changing into the target build directory, re-running configure and then running make from there. -# the target dir gets built by the first invocation of configure, and is the newest dir, so we find its name with ls and awk. +# it can be avoided by changing into the target build directory, re-running configure and then running make from there. +# the target dir gets built by the first invocation of configure, and is the newest dir, so we find its name with ls and awk. # -tar xf libffi-3.0.10.tar.gz && (cd libffi-3.0.10 && CFLAGS=$GLOBAL_CFLAGS LDFLAGS="$GLOBAL_LDFLAGS" ./configure $GLOBAL_CONF && cd `ls -ltd * | awk '/^d/ {print $9; exit}'` && CFLAGS=$GLOBAL_CFLAGS LDFLAGS="$GLOBAL_LDFLAGS" ../configure $GLOBAL_CONF && make && make install) || die "libffi build failed" + tar xf libffi-3.0.10.tar.gz && (cd libffi-3.0.10 && CFLAGS=$GLOBAL_CFLAGS LDFLAGS="$GLOBAL_LDFLAGS" ./configure $GLOBAL_CONF && cd `ls -ltd * | awk '/^d/ {print $9; exit}'` && CFLAGS=$GLOBAL_CFLAGS LDFLAGS="$GLOBAL_LDFLAGS" ../configure $GLOBAL_CONF && make && make install) || die "libffi build failed" +else + tar xf libffi-3.0.10.tar.gz && (cd libffi-3.0.10 && CFLAGS=$GLOBAL_CFLAGS LDFLAGS="$GLOBAL_LDFLAGS" ./configure $GLOBAL_CONF && make && make install) || die "libffi build failed" +fi # time to bootstrap the circular dependency between pkg-config and glib. # # step one: build glib with everything specified so that pkg-config is not used or required |