diff options
| author | Matt Corallo <matt@bluematt.me> | 2012-02-15 14:42:51 -0500 |
|---|---|---|
| committer | Matt Corallo <matt@bluematt.me> | 2012-02-15 16:39:01 -0500 |
| commit | b03cb15789d021a2dc8c32cbe5ed92ad16da0f40 (patch) | |
| tree | 7b2d3db8b3af69b31f1b7e713729714159ba8a07 /contrib | |
| parent | 32af6b16f190d44adbbc02595f832af2a21b9d2b (diff) | |
| download | bitcoin-b03cb15789d021a2dc8c32cbe5ed92ad16da0f40.tar.xz | |
Make bitcoin-qt static-link libqrcode and add it for debian pkgs.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/debian/control | 3 | ||||
| -rwxr-xr-x | contrib/debian/rules | 2 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/deps-win32.yml | 2 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/gitian.yml | 10 |
4 files changed, 12 insertions, 5 deletions
diff --git a/contrib/debian/control b/contrib/debian/control index c41664ca6f..745fd71ea8 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -15,7 +15,8 @@ Build-Depends: debhelper, libboost-thread-dev (>> 1.35) | libboost-thread1.35-dev, libboost-test-dev (>> 1.35) | libboost-test1.35-dev, qt4-qmake, - libqt4-dev + libqt4-dev, + libqrencode-dev Standards-Version: 3.9.2 Homepage: http://www.bitcoin.org/ Vcs-Git: git://github.com/bitcoin/bitcoin.git diff --git a/contrib/debian/rules b/contrib/debian/rules index a1d65652e3..6d6f119b59 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -20,7 +20,7 @@ override_dh_auto_clean: cd src; $(MAKE) -f makefile.unix clean override_dh_auto_configure: - qmake bitcoin-qt.pro + qmake bitcoin-qt.pro USE_SSL=1 USE_QRCODE=1 override_dh_auto_test: cd src; $(MAKE) -f makefile.unix test_bitcoin diff --git a/contrib/gitian-descriptors/deps-win32.yml b/contrib/gitian-descriptors/deps-win32.yml index 4485f3658f..0107b306ec 100644 --- a/contrib/gitian-descriptors/deps-win32.yml +++ b/contrib/gitian-descriptors/deps-win32.yml @@ -59,5 +59,3 @@ script: | cd .. # tar cjvpf "$OUTDIR/bitcoin-deps-0.0.1.tbz2" "$HOME/build" - - diff --git a/contrib/gitian-descriptors/gitian.yml b/contrib/gitian-descriptors/gitian.yml index 8a0ee0e038..086e09743d 100644 --- a/contrib/gitian-descriptors/gitian.yml +++ b/contrib/gitian-descriptors/gitian.yml @@ -16,13 +16,15 @@ packages: - "libssl-dev" - "git-core" - "unzip" -- "libqrencode-dev" +- "pkg-config" +- "libpng12-dev" reference_datetime: "2011-01-30 00:00:00" remotes: - "url": "https://github.com/bitcoin/bitcoin.git" "dir": "bitcoin" files: - "miniupnpc-1.6.tar.gz" +- "qrencode-3.2.0.tar.bz2" script: | INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" @@ -32,6 +34,12 @@ script: | INSTALLPREFIX=$INSTDIR make $MAKEOPTS install cd .. # + tar xjf qrencode-3.2.0.tar.bz2 + cd qrencode-3.2.0 + ./configure --prefix=$INSTDIR --enable-static --disable-shared + make $MAKEOPTS install + cd .. + # cd bitcoin mkdir -p $OUTDIR/src cp -a . $OUTDIR/src |