diff options
| author | Andrew Lewman <andrew@torproject.org> | 2008-08-31 21:41:24 +0000 |
|---|---|---|
| committer | Andrew Lewman <andrew@torproject.org> | 2008-08-31 21:41:24 +0000 |
| commit | 33093c0f1a147be229653a3712225d9e9e024ef5 (patch) | |
| tree | b72d7defd9a3eac981477d16c3283eb8b18e77ba | |
| parent | 147f75c525ff5a3bf1b01eafe99f6fffda8f7e3d (diff) | |
| download | tor-33093c0f1a147be229653a3712225d9e9e024ef5.tar.gz tor-33093c0f1a147be229653a3712225d9e9e024ef5.zip | |
Convert to ARCH. Add in a compatibility CFLAG for osx 10.5
svn:r16703
| -rw-r--r-- | contrib/polipo/Makefile.osx | 2 | ||||
| -rw-r--r-- | contrib/polipo/package.sh | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/contrib/polipo/Makefile.osx b/contrib/polipo/Makefile.osx index 2314c3e327..8e748e2adb 100644 --- a/contrib/polipo/Makefile.osx +++ b/contrib/polipo/Makefile.osx @@ -30,7 +30,7 @@ FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_ROOT)/\" \ DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES) -UNIVERSAL = -O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc +UNIVERSAL = -O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc LDFLAGS = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) $(UNIVERSAL) diff --git a/contrib/polipo/package.sh b/contrib/polipo/package.sh index fea13b7ad9..83f74212be 100644 --- a/contrib/polipo/package.sh +++ b/contrib/polipo/package.sh @@ -18,16 +18,16 @@ if [ -x /usr/bin/sw_vers ]; then # the OS version OSVER=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 | cut -d"." -f1,2` case "$OSVER" in - "10.5") OS="leopard" ARCH="universal";; - "10.4") OS="tiger" ARCH="universal";; - "10.3") OS="panther" ARCH="ppc";; - "10.2") OS="jaguar" ARCH="ppc";; - "10.1") OS="puma" ARCH="ppc";; - "10.0") OS="cheetah" ARCH="ppc";; - *) OS="unknown";; + "10.5") ARCH="universal";; + "10.4") ARCH="universal";; + "10.3") ARCH="ppc";; + "10.2") ARCH="ppc";; + "10.1") ARCH="ppc";; + "10.0") ARCH="ppc";; + *) ARCH="unknown";; esac else - OS="unknown" + ARCH="unknown" fi # Where will we put our temporary files? @@ -78,10 +78,10 @@ $PACKAGEMAKER -build \ find $BUILD_DIR/output -print0 | sudo xargs -0 chown root:wheel -mv $BUILD_DIR/output "$BUILD_DIR/Polipo-$VERSION-$OS-$ARCH" -rm -f "Polipo-$VERSION-$OS-$ARCH-Bundle.dmg" +mv $BUILD_DIR/output "$BUILD_DIR/Polipo-$VERSION-$ARCH" +rm -f "Polipo-$VERSION-$ARCH-Bundle.dmg" USER="`whoami`" -sudo hdiutil create -format UDZO -srcfolder "$BUILD_DIR/Polipo-$VERSION-$OS-$ARCH" "Polipo-$VERSION-$OS-$ARCH.dmg" -sudo chown "$USER" "Polipo-$VERSION-$OS-$ARCH.dmg" +sudo hdiutil create -format UDZO -srcfolder "$BUILD_DIR/Polipo-$VERSION-$ARCH" "Polipo-$VERSION-$ARCH.dmg" +sudo chown "$USER" "Polipo-$VERSION-$ARCH.dmg" #sudo rm -rf $BUILD_DIR |