Version 4: try to fix PPC build

GPGTools · Mar 23, 2011 · 5aaecdd · 5aaecdd
1 parent 803a665
commit 5aaecdd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/Installer/INSTALLER.txt b/Installer/INSTALLER.txt
@@ -1,4 +1,4 @@
-Thank you for installing MacGPG1 (version 1.4.11-2).
+Thank you for installing MacGPG1 (version 1.4.11-4).
 
 This will allow you to use OpenPGP on OS X.
 

diff --git a/Installer/MacGPG1.pkgproj b/Installer/MacGPG1.pkgproj
@@ -533,7 +533,7 @@
 				<key>RELOCATABLE</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.4.11-1</string>
+				<string>1.4.11-4</string>
 			</dict>
 			<key>UUID</key>
 			<string>5BCCF690-7295-423B-89B3-5BAC72D8B16A</string>

diff --git a/Installer/postflight.sh b/Installer/postflight.sh
@@ -3,6 +3,7 @@
 stdDir="/usr/local";
 gpgDir="/usr/local/MacGPG1";
 
-[ -f $stdDir/bin/gpg ]  || ln -s $gpgDir/bin/gpg $stdDir/bin/gpg
+[ -L $stdDir/bin/gpg ] && rm $stdDir/bin/gpg
+[ -f $stdDir/bin/gpg ] || ln -s $gpgDir/bin/gpg $stdDir/bin/gpg
 
 exit 0
diff --git a/Makefile.config b/Makefile.config
@@ -1,6 +1,6 @@
 name="MacGPG1"
 volumeName="$name"
-version="1.4.11-2"
+version="1.4.11-4"
 appName="$name.pkg"
 appPath="build/$name.pkg"
 bundleName="$name.pkg"

diff --git a/build-script.sh b/build-script.sh
@@ -36,10 +36,11 @@ fi
 
 tar -xzf "$version$fileExt";
 cd "$version";
-
-./configure CFLAGS="-arch ppc -arch x86_64 -arch i386" --disable-dependency-tracking --disable-asm --prefix="$target" && \
-make && \
-make check
+export MACOSX_DEPLOYMENT_TARGET="10.5"
+export CFLAGS="-mmacosx-version-min=10.5 -DUNIX -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch i386 -arch ppc -arch x86_64"
+./configure --enable-static=yes --disable-endian-check --disable-dependency-tracking --disable-asm --enable-osx-universal-binaries --prefix="$target" && \
+make -j2 && \
+make -j2 check
 
 if [ "$?" != "0" ]; then
     echo "Could not compile the sources!";