diff options
| author | Marius Kintel <marius@kintel.net> | 2012-07-13 19:08:46 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-07-13 19:08:46 (GMT) |
| commit | 1395af1101ab7d5b521bd152f1c883df72250add (patch) | |
| tree | c275cd5d32146d39cbe7507e1b4c6cf2b1d99f47 /scripts | |
| parent | e1fe9a33a6f078d2e3f9e2a7393c4a1b177b801b (diff) | |
| parent | 38a4585d1a9abe9c779c5d0677bfc81c407db371 (diff) | |
Merge branch 'master' into version_check
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 405f7aa..3e352e1 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -10,7 +10,7 @@ # -6 Build only 64-bit binaries # # Prerequisites: -# - MacPorts: curl +# - MacPorts: curl, cmake # - Qt4 # # FIXME: @@ -24,6 +24,7 @@ SRCDIR=$BASEDIR/src DEPLOYDIR=$BASEDIR/install MAC_OSX_VERSION_MIN=10.5 OPTION_32BIT=true +export QMAKESPEC=macx-g++ printUsage() { @@ -129,11 +130,11 @@ build_mpfr() cd $BASEDIR/src rm -rf mpfr-$version if [ ! -f mpfr-$version.tar.bz2 ]; then - curl -O http://www.mpfr.org/mpfr-current/mpfr-$version.tar.bz2 + curl -O http://www.mpfr.org/mpfr-$version/mpfr-$version.tar.bz2 fi tar xjf mpfr-$version.tar.bz2 cd mpfr-$version - curl -O http://www.mpfr.org/mpfr-current/allpatches + curl -O http://www.mpfr.org/mpfr-$version/allpatches patch -N -Z -p1 < allpatches if $OPTION_32BIT; then mkdir build-i386 |