commit 50ab9df173ecec4820d6b9f444149f7383d2a078 Merge: f608a0d 86ccdf0 Author: Mike Perry mikeperry-git@torproject.org Date: Wed Jan 15 11:59:12 2014 -0800

Merge remote-tracking branch 'isis/fix/10383-openssl-nistp-build-flags'

gitian/descriptors/linux/gitian-tor.yml | 2 +- gitian/descriptors/mac/gitian-tor.yml | 2 +- gitian/descriptors/windows/gitian-tor.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --cc gitian/descriptors/linux/gitian-tor.yml index 736e84c,d4d68e2..81e17a9 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@@ -54,11 -55,10 +54,11 @@@ script: cp $INSTDIR/libevent/lib/libevent-2.0.so.5 $INSTDIR/Tor/ cd .. # - cd openssl + tar xzf openssl.tar.gz + cd openssl-* find -type f | xargs touch --date="$REFERENCE_DATETIME" #./Configure -shared --prefix=$INSTDIR/openssl linux-elf - ./config -shared --prefix=$INSTDIR/openssl + ./config -shared --prefix=$INSTDIR/openssl --enable-ec_nistp_64_gcc_128 make make install cp $INSTDIR/openssl/lib/libssl.so.1.0.0 $INSTDIR/Tor/ diff --cc gitian/descriptors/mac/gitian-tor.yml index 7707555,4aec4f0..32703b8 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@@ -64,10 -65,9 +64,10 @@@ script: #cp $INSTDIR/zlib/lib/*.dylib $INSTDIR/Tor/ #cd .. # - cd openssl + tar xzf openssl.tar.gz + cd openssl-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl + ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl --enable-ec_nistp_64_gcc_128 make # SHARED_LDFLAGS="-shared -dynamiclib -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/" make install #cp $INSTDIR/openssl/lib/*.dylib $INSTDIR/TorBrowserBundle.app/Tor/ diff --cc gitian/descriptors/windows/gitian-tor.yml index 901383e,4360a7a..a30af7d --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@@ -70,10 -71,9 +70,10 @@@ script: cp $INSTDIR/libevent/bin/*.dll $INSTDIR/Tor/ cd .. # - cd openssl + tar xzf openssl.tar.gz + cd openssl-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl + ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl --enable-ec_nistp_64_gcc_128 make make install cp $INSTDIR/openssl/bin/*.dll $INSTDIR/Tor/