From: devrandom <c1.github@niftybox.net>
Date: Wed, 27 Apr 2011 23:26:14 +0000 (-0700)
Subject: gitian descriptor with miniupnpc
X-Git-Tag: v0.4.0-unstable~234^2~105^2~1
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=26e0de41c31fc8271c1469bbc7b901423d95df34;p=novacoin.git

gitian descriptor with miniupnpc
---

diff --git a/contrib/gitian.yml b/contrib/gitian.yml
index 92385e5..b7053b6 100644
--- a/contrib/gitian.yml
+++ b/contrib/gitian.yml
@@ -18,20 +18,29 @@ remotes:
   "dir": "bitcoin"
 files:
 - "wxWidgets-2.9.1.tar.bz2"
+- "miniupnpc-1.5.tar.gz"
 script: |
   INSTDIR="$HOME/install"
   export LIBRARY_PATH="$INSTDIR/lib"
+  #
+  tar xzf miniupnpc-1.5.tar.gz
+  cd miniupnpc-1.5
+  INSTALLPREFIX=$INSTDIR make $MAKEOPTS install
+  cd ..
+  #
   tar xjf wxWidgets-2.9.1.tar.bz2
   cd wxWidgets-2.9.1
   ./configure --prefix=$INSTDIR --enable-monolithic --disable-shared
   perl -i -p -e "s/__TIME__/\"$REFERENCE_TIME\"/;s/__DATE__/\"$REFERENCE_DATE\"/" include/wx/chartype.h
   make $MAKEOPTS install
-  cd ../bitcoin
+  cd ..
+  #
+  cd bitcoin
   mkdir -p $OUTDIR/src
   cp -a . $OUTDIR/src
   rm -rf $OUTDIR/src/.git
   mv $OUTDIR/src/locale $OUTDIR
   cp $OUTDIR/src/license.txt $OUTDIR
-  make -f makefile.unix $MAKEOPTS  WXLIBS="-Wl,-Bstatic -l wx_gtk2u-2.9 -Wl,-Bdynamic -l gtk-x11-2.0 -l SM -l Xxf86vm" INCLUDEPATHS="`$INSTDIR/bin/wx-config --cflags`" bitcoin bitcoind
+  PATH=$INSTDIR/bin:$PATH make -f makefile.unix CXX="g++ -I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoin bitcoind
   mkdir -p $OUTDIR/bin/$GBUILD_BITS
   cp bitcoin bitcoind $OUTDIR/bin/$GBUILD_BITS