Merge pull request #3536

0425715 gitian: add explicit dependency build for linux (Wladimir J. van der Laan)
279af1a build: use Ubuntu 12.04 for linux gitian build (Wladimir J. van der Laan)

contrib/gitian-descriptors/deps-linux.yml

@@ -0,0 +1,62 @@
+---
+name: "bitcoin"
+suites:
+- "precise"
+architectures:
+- "i386"
+- "amd64"
+packages:
+- "unzip"
+- "pkg-config"
+- "libtool"
+- "faketime"
+- "bsdmainutils"
+reference_datetime: "2013-06-01 00:00:00"
+remotes: []
+files:
+- "miniupnpc-1.8.tar.gz"
+- "qrencode-3.4.3.tar.bz2"
+- "protobuf-2.5.0.tar.bz2"
+- "db-4.8.30.NC.tar.gz"
+script: |
+  STAGING="$HOME/install"
+  OPTFLAGS='-O2'
+  export LIBRARY_PATH="$STAGING/lib"
+  # Integrity Check
+  echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c  miniupnpc-1.8.tar.gz"   | sha256sum -c
+  echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98  qrencode-3.4.3.tar.bz2" | sha256sum -c
+  echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677  protobuf-2.5.0.tar.bz2" | sha256sum -c
+  echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef  db-4.8.30.NC.tar.gz"    | sha256sum -c
+
+  tar xzfm miniupnpc-1.8.tar.gz
+  cd miniupnpc-1.8
+  #   miniupnpc is always built with -fPIC
+  INSTALLPREFIX=$STAGING make $MAKEOPTS install
+  rm -f $STAGING/lib/libminiupnpc.so* # no way to skip shared lib build
+  cd ..
+  #
+  tar xjfm qrencode-3.4.3.tar.bz2
+  cd qrencode-3.4.3
+  #   need --with-pic to avoid relocation error in 64 bit builds
+  ./configure --prefix=$STAGING --enable-static --disable-shared -with-pic --without-tools
+  make $MAKEOPTS install
+  cd ..
+  #
+  tar xjfm protobuf-2.5.0.tar.bz2
+  cd protobuf-2.5.0
+  mkdir -p $STAGING/host/bin
+  #   need --with-pic to avoid relocation error in 64 bit builds
+  ./configure --prefix=$STAGING --bindir=$STAGING/host/bin --enable-static --disable-shared --with-pic
+  make $MAKEOPTS install
+  cd ..
+  #
+  tar xzf db-4.8.30.NC.tar.gz
+  cd db-4.8.30.NC/build_unix
+  #   need --with-pic to avoid relocation error in 64 bit builds
+  ../dist/configure --prefix=$STAGING --enable-cxx --disable-shared --with-pic
+  make $MAKEOPTS library_build
+  make install_lib install_include
+  cd ../..
+  #
+  cd $STAGING
+  tar -czf $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r1.tar.gz include lib bin host

contrib/gitian-descriptors/gitian.yml

@@ -1,12 +1,11 @@
 ---
 name: "bitcoin"
 suites:
-- "lucid"
+- "precise"
 architectures:
 - "i386"
 - "amd64"
 packages: 
-- "libdb4.8++-dev"
 - "qt4-qmake"
 - "libqt4-dev"
 - "libboost-system-dev"
@@ -18,7 +17,6 @@ packages:
 - "git-core"
 - "unzip"
 - "pkg-config"
-- "libpng12-dev"
 - "autoconf2.13"
 - "libtool"
 - "automake"
@@ -29,45 +27,29 @@ remotes:
 - "url": "https://github.com/bitcoin/bitcoin.git"
   "dir": "bitcoin"
 files:
-- "miniupnpc-1.6.tar.gz"
+- "bitcoin-deps-linux32-gitian-r1.tar.gz"
-- "qrencode-3.2.0.tar.bz2"
+- "bitcoin-deps-linux64-gitian-r1.tar.gz"
-- "protobuf-2.5.0.tar.bz2"
 script: |
   STAGING="$HOME/install"
+  OPTFLAGS='-O2'
+  BINDIR="${OUTDIR}/bin/${GBUILD_BITS}" # 32/64 bit build specific output directory
   export LIBRARY_PATH="$STAGING/lib"
-  # Integrity Check
+  mkdir -p ${BINDIR}
-  echo "bbd6b756e6af44b5a5b0f9b93eada3fb8922ed1d6451b7d6f184d0ae0c813994  miniupnpc-1.6.tar.gz"   | sha256sum -c
-  echo "03c4bc7cd9a75747c3815d509bbe061907d615764f2357923f0db948c567068f  qrencode-3.2.0.tar.bz2" | sha256sum -c
-  echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677  protobuf-2.5.0.tar.bz2" | sha256sum -c
-
-  tar xzfm miniupnpc-1.6.tar.gz
-  cd miniupnpc-1.6
-  INSTALLPREFIX=$STAGING make $MAKEOPTS install
-  cd ..
   #
-  tar xjfm qrencode-3.2.0.tar.bz2
+  mkdir -p $STAGING
-  cd qrencode-3.2.0
+  cd $STAGING
-  sed -i 's/@LIBPTHREAD@//' libqrencode.pc.in
+  tar xzfm ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r1.tar.gz
-  ./configure --prefix=$STAGING --enable-static --disable-shared
+  cd ../build
-  make $MAKEOPTS install
-  cd ..
-  #
-  tar xjfm protobuf-2.5.0.tar.bz2
-  cd protobuf-2.5.0
-  mkdir -p $STAGING/host/bin
-  ./configure --prefix=$STAGING --bindir=$STAGING/host/bin --enable-static --disable-shared
-  make $MAKEOPTS install
-  cd ..
   #
   cd bitcoin
   export TAR_OPTIONS=--mtime=`echo $REFERENCE_DATETIME | awk '{ print $1 }'`
   ./autogen.sh
-  ./configure --prefix=$STAGING --bindir=$OUTDIR --with-protoc-bindir=$STAGING/host/bin --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include" LDFLAGS="-L$STAGING/lib" CXXFLAGS="-frandom-seed=bitcoin"
+  ./configure --prefix=$STAGING --bindir=$BINDIR --with-protoc-bindir=$STAGING/host/bin --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}"
   make dist
   mkdir -p distsrc
   cd distsrc
   tar --strip-components=1 -xf ../bitcoin-*.tar.*
-  ./configure --prefix=$STAGING --bindir=$OUTDIR --with-protoc-bindir=$STAGING/host/bin --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include" LDFLAGS="-L$STAGING/lib" CXXFLAGS="-frandom-seed=bitcoin"
+  ./configure --prefix=$STAGING --bindir=$BINDIR --with-protoc-bindir=$STAGING/host/bin --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}"
   make $MAKEOPTS
   make $MAKEOPTS install-strip
   mkdir -p $OUTDIR/src

doc/release-process.md

@@ -51,6 +51,8 @@ Release Process
 	wget 'https://download.qt-project.org/official_releases/qt/5.2/5.2.0/single/qt-everywhere-opensource-src-5.2.0.tar.gz'
 	wget 'https://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2'
 	cd ..
+	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-linux.yml
+	mv build/out/*.tar.gz inputs/
 	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml
 	mv build/out/boost-win32-*.zip inputs/
 	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win32.yml