[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor-browser-bundle/master] Build pyptlib for linux.
commit 8c2f691dd0f06742cb4570b559bd36b95b2da210
Author: David Fifield <david@xxxxxxxxxxxxxxx>
Date: Fri Dec 13 22:09:29 2013 -0800
Build pyptlib for linux.
---
gitian/descriptors/linux/gitian-pluggable-transports.yml | 11 ++++++++++-
gitian/mkbundle-linux.sh | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml
index 104bb14..b328214 100644
--- a/gitian/descriptors/linux/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml
@@ -8,12 +8,15 @@ architectures:
packages:
- "git-core"
- "zip"
+- "python-setuptools"
- "faketime"
- "hardening-wrapper"
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:
- "dzip.sh"
script: |
@@ -33,9 +36,15 @@ script: |
export DEB_BUILD_HARDENING_FORMAT=1
export DEB_BUILD_HARDENING_PIE=1
#
- mkdir -p $PTDIR/
+ mkdir -p $PTDIR
mkdir -p $INSTDIR/Debug/
#
+ 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"
#./Configure -shared --prefix=$INSTDIR/openssl linux-elf
diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh
index 628cd86..edb272b 100755
--- a/gitian/mkbundle-linux.sh
+++ b/gitian/mkbundle-linux.sh
@@ -128,7 +128,7 @@ then
echo "****** Starting Pluggable Transports Component of Linux Bundle (3/4 for Linux) ******"
echo
- ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml
+ ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml
if [ $? -ne 0 ];
then
#mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S`
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits