diff options
| -rw-r--r-- | social/bitcoin-daemon/PKGBUILD | 33 | ||||
| -rw-r--r-- | social/bitcoin-daemon/makefile.parabola (renamed from social/bitcoin-daemon/makefile.archlinux) | 44 |
2 files changed, 48 insertions, 29 deletions
diff --git a/social/bitcoin-daemon/PKGBUILD b/social/bitcoin-daemon/PKGBUILD index c00439328..77dd1d86f 100644 --- a/social/bitcoin-daemon/PKGBUILD +++ b/social/bitcoin-daemon/PKGBUILD @@ -4,43 +4,50 @@ pkgname=bitcoin-daemon _pkgname=bitcoin -pkgver=0.3.21 -_bcver=0.3.21 +pkgver=0.3.22 +_bcver=0.3.22 pkgrel=1 pkgdesc="Bitcoin is a peer-to-peer network based digital currency." arch=('i686' 'x86_64') url="http://www.bitcoin.org/" -depends=('expat' 'boost-libs>=1.43') -makedepends=('boost') +depends=('expat' 'boost-libs>=1.43' 'miniupnpc') +makedepends=('boost' 'openssl') conflicts=('bitcoin-bin' 'bitcoin') license=('MIT') install="bitcoin-daemon.install" source=(http://ufpr.dl.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-$_bcver/bitcoin-$pkgver-linux.tar.gz - makefile.archlinux + makefile.parabola bitcoin-daemon.install rc.bitcoind) +md5sums=('87ed8d95dd0c94635d5237dc1490bb0d' + 'dc3d207309d11e285ece6b3bdf61d90b' + 'a388684057de2bb543cb7f795dc693cf' + '4a9ab4997487bb5f8e3c6b1d580045af') build() { - cd $srcdir/${_pkgname}-${pkgver}/src + cd $srcdir/${_pkgname}-${pkgver}/src/src # copy correct makefile to src dir - cp $srcdir/makefile.archlinux Makefile + cp $srcdir/makefile.parabola Makefile # fixes... mkdir -p obj/nogui 2>/dev/null rm -f cryptopp/obj/* - + # to build (single-threaded make due to OOM issues) make bitcoind } package() { - cd $srcdir/${_pkgname}-${pkgver} + cd $srcdir/${_pkgname}-${pkgver}/src/src + mkdir -p $pkgdir/{usr/bin,usr/share/licenses/$pkgname,etc/rc.d,var/lib/$pkgname} - install -D -m755 ./src/bitcoind $pkgdir/usr/bin/ + install -D -m755 ./bitcoind $pkgdir/usr/bin/ install -D -m755 $srcdir/rc.bitcoind $pkgdir/etc/rc.d/bitcoind - install -m 644 ./license.txt $pkgdir/usr/share/licenses/$pkgname/ + + install -D -m 644 $srcdir/$_pkgname-$pkgver/COPYING \ + $pkgdir/usr/share/licenses/$pkgname/ # strip shit from executables find $pkgdir/usr/bin/ -type f | xargs -L1 strip @@ -49,7 +56,3 @@ package() { chown -R 8333:8333 $pkgdir/var/lib/$pkgname chmod -R 700 $pkgdir/var/lib/$pkgname } -md5sums=('19e530a9b60e3a0987998a87b30d8cdc' - '8e2ff558c2538e53c177513ad7d8b9a5' - 'a388684057de2bb543cb7f795dc693cf' - '4a9ab4997487bb5f8e3c6b1d580045af') diff --git a/social/bitcoin-daemon/makefile.archlinux b/social/bitcoin-daemon/makefile.parabola index 062a29d82..1f8236b66 100644 --- a/social/bitcoin-daemon/makefile.archlinux +++ b/social/bitcoin-daemon/makefile.parabola @@ -3,6 +3,7 @@ # Distributed under the MIT/X11 software license, see the accompanying # file license.txt or http://www.opensource.org/licenses/mit-license.php. +CXX=g++ INCLUDEPATHS= \ -I"/usr/include" \ @@ -11,20 +12,35 @@ LIBPATHS= \ -L"/usr/lib" \ -L"/usr/local/lib" +DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL + +USE_UPNP:=1 + +# --as-needed lazy linking set as default behavior of ld because i guess, there are useless libs here +# Of couse, this may be overriden by LDFLAGS in makepkg.conf LIBS= \ - -Wl,-Bstatic \ + -Wl,--as-needed \ + ${LDFLAGS} \ -l boost_system \ -l boost_filesystem \ -l boost_program_options \ -l boost_thread \ -l db_cxx \ - -l crypto \ - -Wl,-Bdynamic \ + +ifdef USE_UPNP + LIBS += -l miniupnpc + DEFS += -DUSE_UPNP=$(USE_UPNP) +endif + +LIBS+= \ -l gthread-2.0 \ - ${LDFLAGS} + -l z \ + -l dl \ + -l ssl \ + -l crypto -DEBUGFLAGS=-g -D__WXDEBUG__ -CCFLAGS=${CXXFLAGS} -Wno-invalid-offsetof -Wformat $(WXDEFS) $(INCLUDEPATHS) +#DEBUGFLAGS=-g -D__WXDEBUG__ +CCFLAGS=${CXXFLAGS} -DBOOST_FILESYSTEM_DEPRECATED -Wno-invalid-offsetof -Wformat $(WXDEFS) $(INCLUDEPATHS) $(DEFS) HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \ script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h @@ -45,28 +61,28 @@ all: bitcoin headers.h.gch: headers.h $(HEADERS) - g++ -c $(CCFLAGS) -DGUI -o $@ $< + $(CXX) -c $(CCFLAGS) -DGUI -o $@ $< obj/%.o: %.cpp $(HEADERS) headers.h.gch - g++ -c $(CCFLAGS) -DGUI -o $@ $< + $(CXX) -c $(CCFLAGS) -DGUI -o $@ $< # -DCRYPTOPP_DISABLE_SSE2 cryptopp/obj/%.o: cryptopp/%.cpp - g++ -c $(CCFLAGS) -O3 -o $@ $< + $(CXX) -c $(CCFLAGS) -O3 -o $@ $< bitcoin: $(OBJS) obj/ui.o obj/uibase.o - g++ $(CCFLAGS) -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS) - + $(CXX) $(CCFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(WXLIBS) obj/nogui/%.o: %.cpp $(HEADERS) - g++ -c $(CCFLAGS) -o $@ $< + $(CXX) -c $(CCFLAGS) -o $@ $< bitcoind: $(OBJS:obj/%=obj/nogui/%) - g++ $(CCFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -ldl -lz - + $(CXX) $(CCFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) clean: -rm -f obj/*.o -rm -f obj/nogui/*.o -rm -f cryptopp/obj/*.o -rm -f headers.h.gch + -rm -f bitcoin + -rm -f bitcoind |