pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
bitcoin: Drop QMAKE and BOOST defines that are not used.
Module Name: pkgsrc-wip
Committed By: Greg Troxel <gdt%ir.bbn.com@localhost>
Pushed By: gdt
Date: Mon Nov 28 14:19:59 2016 -0500
Changeset: 853ad2920e71424bff4ae295284ef5ccfa819b70
Modified Files:
bitcoin/Makefile
bitcoin/options.mk
Log Message:
bitcoin: Drop QMAKE and BOOST defines that are not used.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=853ad2920e71424bff4ae295284ef5ccfa819b70
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
bitcoin/Makefile | 12 ------------
bitcoin/options.mk | 9 ---------
2 files changed, 21 deletions(-)
diffs:
diff --git a/bitcoin/Makefile b/bitcoin/Makefile
index 13f2eca..b88f284 100644
--- a/bitcoin/Makefile
+++ b/bitcoin/Makefile
@@ -21,9 +21,6 @@ GNU_CONFIGURE= yes
CXXFLAGS+= -std=c++0x -I${BUILDLINK_PREFIX.boost-libs}/include/boost
CXXFLAGS+= -Wl,-R${BUILDLINK_PREFIX.boost-libs}/lib/bitcoin -L${BUILDLINK_PREFIX.boost-libs}/lib/bitcoin
CFLAGS+= -fPIC -Wl,-R${BUILDLINK_PREFIX.boost-libs}/lib/bitcoin -L${BUILDLINK_PREFIX.boost-libs}/lib/bitcoin
-BOOST_LDFLAGS= -L${BUILDLINK_PREFIX.boost-libs}/lib
-BOOST_CPPFLAGS= -I${BUILDLINK_PREFIX.boost-libs}/include
-
# TODO: explain why this is necessary, and whether it duplicates the above
CPPFLAGS+=-I${BUILDLINK_PREFIX.boost-headers}/include/boost, -Wl,-R${BUILDLINK_PREFIX.boost-libs}/lib/bitcoin
@@ -37,15 +34,6 @@ CONFIGURE_ARGS+= ${PREFIX}/include/db4
# TODO: explain why this is necessary
BUILDLINK_TRANSFORM+= l:db_cxx:db4_cxx
-QMAKE_OPTIONS+= BOOST_INCLUDE_PATH=${PREFIX}/include/boost
-QMAKE_OPTIONS+= BDB_INCLUDE_PATH=${PREFIX}/include/db4
-QMAKE_OPTIONS+= OPENSSL_INCLUDE_PATH=${PREFIX}/include/openssl
-
-QMAKE_OPTIONS+= BOOST_LIB_PATH=${PREFIX}/lib
-QMAKE_OPTIONS+= BDB_LIB_PATH=${PREFIX}/lib
-QMAKE_OPTIONS+= OPENSSL_LIB_PATH=${PREFIX}/lib
-QMAKE_OPTIONS+= LIB_RPATH=${PREFIX}/lib
-
RCD_SCRIPTS= bitcoind
BUILD_DEFS+= VARBASE
OWN_DIRS= ${VARBASE}/bitcoin
diff --git a/bitcoin/options.mk b/bitcoin/options.mk
index 1d2a184..d05c648 100644
--- a/bitcoin/options.mk
+++ b/bitcoin/options.mk
@@ -7,22 +7,13 @@ PKG_SUGGESTED_OPTIONS+= dbus qrcode
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mminiupnpc)
-QMAKE_OPTIONS+= USE_UPNP=1
.include "../../wip/miniupnpc/buildlink3.mk"
-.else
-QMAKE_OPTIONS+= USE_UPNP=-
.endif
.if !empty(PKG_OPTIONS:Mdbus)
-QMAKE_OPTIONS+= USE_DBUS=1
.include "../../x11/qt4-qdbus/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mqrcode)
-QMAKE_OPTIONS+= USE_QRCODE=1
.include "../../converters/qrencode/buildlink3.mk"
.endif
-
-.if !empty(PKG_OPTIONS:Minet6)
-QMAKE_OPTIONS+= USE_IPV6=0
-.endif
Home |
Main Index |
Thread Index |
Old Index