commit dbdb86c6d3e7d936169bbf61d217a3e694d396cb Author: David Fifield david@bamsoftware.com Date: Tue Nov 12 06:27:35 2013 +0000
Build pyptlib for mac. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 9 +++++++++ gitian/mkbundle-mac.sh | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 1a6b933..08885ee 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -7,6 +7,7 @@ architectures: packages: - "git-core" - "zip" +- "python-setuptools" - "faketime" - "libtool" #- "libssl0.9.8" @@ -14,6 +15,8 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/nmathewson/openssl.git" "dir": "openssl" +- "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" + "dir": "pyptlib" files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -47,6 +50,12 @@ script: | # For OpenSSL sudo ln -s /usr/apple-osx/bin/apple-osx-gcc /usr/apple-osx/bin/i686-apple-darwin11-cc # + cd pyptlib + find -type f | xargs touch --date="$REFERENCE_DATETIME" + python setup.py build --build-lib build + cp -a build/pyptlib $PTDIR/ + cd .. + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" CC=cc ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 3b40142..debc170 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -124,7 +124,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" echo
- ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S`