[tor-commits] [tor-browser-bundle/master] Update linux gitian descriptors to remove all references to libz.so.

[mikeperry at torproject.org]

commit bb33dc8ab3103c17022bafcf0f6c595dc4d3af46
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Nov 12 05:41:28 2013 +0000

    Update linux gitian descriptors to remove all references to libz.so.
    
     * ADD `zlib1g-dev` to remote dependencies list.
     * REMOVE cloning and building of libz.
     * REMOVE ${INSTDIR}/Tor/libz directory.
---
 gitian/descriptors/linux/gitian-tor.yml |   23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index 15437e2..ddd81a7 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -15,14 +15,13 @@ packages:
 - "faketime"
 - "libtool"
 - "hardening-wrapper"
+- "zlib1g-dev"
 reference_datetime: "2000-01-01 00:00:00"
 remotes:
 - "url": "https://git.torproject.org/tor.git"
   "dir": "tor"
 - "url": "https://github.com/libevent/libevent.git"
   "dir": "libevent"
-- "url": "https://github.com/madler/zlib.git"
-  "dir": "zlib"
 - "url": "https://github.com/nmathewson/openssl.git"
   "dir": "openssl"
 files:
@@ -44,16 +43,6 @@ script: |
   export DEB_BUILD_HARDENING_PIE=1
   #
   mkdir -p $INSTDIR/Data/Tor/
-  mkdir -p $INSTDIR/Tor/libz/
-  mkdir -p $INSTDIR/Debug/Tor/libz/
-  #
-  cd zlib
-  find -type f | xargs touch --date="$REFERENCE_DATETIME"
-  ./configure --prefix=$INSTDIR/zlib
-  make $MAKEOPTS SHARED_MODE=1
-  make $MAKEOPTS SHARED_MODE=1 install
-  cp $INSTDIR/zlib/lib/libz.so.1 $INSTDIR/Tor/libz/
-  cd ..
   #
   cd libevent
   ./autogen.sh
@@ -75,14 +64,13 @@ script: |
   cd ..
   #
   chmod 700 $INSTDIR/Tor/*so*
-  chmod 700 $INSTDIR/Tor/libz/*so*
   #
   cd tor
   mkdir -p $OUTDIR/src
   #git archive HEAD | tar -x -C $OUTDIR/src
   ./autogen.sh
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
-  ./configure --disable-asciidoc --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR --with-zlib-dir=$INSTDIR/zlib/
+  ./configure --disable-asciidoc --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR
   make $MAKEOPTS
   make install
   cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/
@@ -98,13 +86,6 @@ script: |
     strip $INSTDIR/Tor/$LIB
     objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $INSTDIR/Tor/$LIB
   done
-  for i in $INSTDIR/Tor/libz/*so*
-  do
-    LIB=`basename $i`
-    objcopy --only-keep-debug $INSTDIR/Tor/libz/$LIB $INSTDIR/Debug/Tor/libz/$LIB
-    strip $INSTDIR/Tor/libz/$LIB
-    objcopy --add-gnu-debuglink=./Debug/Tor/libz/$LIB $INSTDIR/Tor/libz/$LIB
-  done
   #
   ~/build/dzip.sh tor-linux$GBUILD_BITS-gbuilt.zip Data/ Tor/
   ~/build/dzip.sh tor-linux$GBUILD_BITS-debug.zip Debug/