From 5469b00f19bc0446f9fe239eec84d6f97d7e238a Mon Sep 17 00:00:00 2001 From: O01eg Date: Tue, 31 Aug 2010 23:13:48 +0400 Subject: [PATCH] Fix net-p2p/bitcoin patch for r146 --- net-p2p/bitcoin/Manifest | 3 +- net-p2p/bitcoin/bitcoin-9999.ebuild | 2 +- net-p2p/bitcoin/files/bitcoin-9999-Makefile.patch | 38 +++++++++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 net-p2p/bitcoin/files/bitcoin-9999-Makefile.patch diff --git a/net-p2p/bitcoin/Manifest b/net-p2p/bitcoin/Manifest index 1e6f411..db0f19f 100644 --- a/net-p2p/bitcoin/Manifest +++ b/net-p2p/bitcoin/Manifest @@ -1,4 +1,5 @@ AUX bitcoin-0.3.10-Makefile.patch 1150 RMD160 ca89d7831e54dc1fa7ab88ee9958f1a042cabfce SHA1 dec1f02ad902181b6112646367b5f2ccef4a908d SHA256 96552ae5f900e1c2225d1cc52c87b5df3ab8295ab7b4a0479f77237b5282c6c8 +AUX bitcoin-9999-Makefile.patch 1115 RMD160 99fcd411466d5561407e0bb7e778808a97ec338d SHA1 60551cad7d9e72f25ab4e61e04f6d6fb736e6ab4 SHA256 945849bd1f0d06676a0bb864d2c5ee67233d894ed55c3eab1c349b8b5937416b DIST bitcoin-0.3.10-linux.tar.gz 8283934 RMD160 c2dadf2ce163aafb31011820ea30c6455bfb33d0 SHA1 e3fda1ddb31b0d5c35156cacd80dee6ea6ae6423 SHA256 8b5dc1d5663c99ca1c1c7e32b4971fb1d242a8ba3bda92ace3bdadc728f94f9e EBUILD bitcoin-0.3.10.ebuild 138 RMD160 dd9cc43cc58d25d0df5deaf7e956322f63330966 SHA1 6b452d81669f1c77876f3891922185d4953fbdba SHA256 bb17a845a078c4316897843c0f51b3fd45e68ebf4c6951284aa693e69f00a057 -EBUILD bitcoin-9999.ebuild 159 RMD160 704edd9ee0e6452d345046072664e89d90fe11a2 SHA1 9bfcfc59ca3121265d3ae18294ff59da9fcb0d52 SHA256 8459b44b840ccd3d308c828974742913d5db0776f584245dbc1cdc9e4b3c3094 +EBUILD bitcoin-9999.ebuild 157 RMD160 18bb458ce2f516e5f992e7d5e91898669222c94e SHA1 6b84b07b4c465f65fe22b72ef5b3a9b99680b710 SHA256 3ab301368ae482de3df66c991ec7a6be7452cdeb10fc87c6fc8eb0fe97162e10 diff --git a/net-p2p/bitcoin/bitcoin-9999.ebuild b/net-p2p/bitcoin/bitcoin-9999.ebuild index da66019..27f8ad7 100644 --- a/net-p2p/bitcoin/bitcoin-9999.ebuild +++ b/net-p2p/bitcoin/bitcoin-9999.ebuild @@ -2,6 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -PATCH_VERSION=0.3.10 +PATCH_VERSION=9999 inherit bitcoin diff --git a/net-p2p/bitcoin/files/bitcoin-9999-Makefile.patch b/net-p2p/bitcoin/files/bitcoin-9999-Makefile.patch new file mode 100644 index 0000000..45c3496 --- /dev/null +++ b/net-p2p/bitcoin/files/bitcoin-9999-Makefile.patch @@ -0,0 +1,38 @@ +--- makefile.unix 2010-08-31 17:21:24.000000000 +0400 ++++ makefile.unix 2010-08-31 17:29:21.899443518 +0400 +@@ -3,29 +3,21 @@ + # file license.txt or http://www.opensource.org/licenses/mit-license.php. + + +-INCLUDEPATHS= \ +- -I"/usr/local/include/wx-2.9" \ +- -I"/usr/local/lib/wx/include/gtk2-unicode-debug-static-2.9" +- +-WXLIBS= \ +- -Wl,-Bstatic \ +- -l wx_gtk2ud-2.9 \ +- -Wl,-Bdynamic \ +- -l gtk-x11-2.0 -l SM ++INCLUDEPATHS=-I /usr/include/db4.8/ ++ ++WXLIBS=$(shell wx-config-2.9 --libs) + + # for boost 1.37, add -mt to the boost libraries + LIBS= \ +- -Wl,-Bstatic \ + -l boost_system \ + -l boost_filesystem \ + -l boost_program_options \ + -l boost_thread \ + -l db_cxx \ +- -l crypto \ +- -Wl,-Bdynamic \ +- -l gthread-2.0 ++ $(shell pkg-config --libs libcrypto) \ ++ $(shell pkg-config --libs gthread-2.0) + +-DEFS=-D__WXGTK__ -DNOPCH -DFOURWAYSSE2 ++DEFS=$(shell wx-config-2.9 --cxxflags) -DFOURWAYSSE2 + DEBUGFLAGS=-g -D__WXDEBUG__ + CFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) + HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \ -- 1.7.1