Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Make bitcoin-qt static-link libqrcode and add it for debian pkgs.
  • Loading branch information
Matt Corallo committed Feb 15, 2012
1 parent 32af6b1 commit b03cb15
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 13 deletions.
16 changes: 8 additions & 8 deletions bitcoin-qt.pro
Expand Up @@ -19,14 +19,6 @@ OBJECTS_DIR = build
MOC_DIR = build
UI_DIR = build

# use: qmake "USE_QRCODE=1"
# libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
contains(USE_QRCODE, 1) {
message(Building with QRCode support)
DEFINES += USE_QRCODE
LIBS += -lqrencode
}

# use: qmake "RELEASE=1"
contains(RELEASE, 1) {
# Mac: compile for maximum compatibility (10.5, 32-bit)
Expand All @@ -38,6 +30,14 @@ contains(RELEASE, 1) {
}
}

# use: qmake "USE_QRCODE=1"
# libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
contains(USE_QRCODE, 1) {
message(Building with QRCode support)
DEFINES += USE_QRCODE
LIBS += -lqrencode
}

# use: qmake "USE_UPNP=1" ( enabled by default; default)
# or: qmake "USE_UPNP=0" (disabled by default)
# or: qmake "USE_UPNP=-" (not supported)
Expand Down
3 changes: 2 additions & 1 deletion contrib/debian/control
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/debian/rules
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions contrib/gitian-descriptors/deps-win32.yml
Expand Up @@ -59,5 +59,3 @@ script: |
cd ..
#
tar cjvpf "$OUTDIR/bitcoin-deps-0.0.1.tbz2" "$HOME/build"
10 changes: 9 additions & 1 deletion contrib/gitian-descriptors/gitian.yml
Expand Up @@ -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"
Expand All @@ -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
Expand Down

0 comments on commit b03cb15

Please sign in to comment.