bitcoin: reorganize {CPP,C,CXX}FLAGS

[Greg Troxel <gdt%ir.bbn.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%ir.bbn.com@localhost>
Pushed By:	gdt
Date:		Mon Nov 28 15:59:27 2016 -0500
Changeset:	288d8a9e3960c024dcc6e86ddae19a8740fb24d4

Modified Files:
	bitcoin/Makefile

Log Message:
bitcoin: reorganize {CPP,C,CXX}FLAGS

Drop spurious bare prefix in configure.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=288d8a9e3960c024dcc6e86ddae19a8740fb24d4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 bitcoin/Makefile | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diffs:
diff --git a/bitcoin/Makefile b/bitcoin/Makefile
index d013633..49f8953 100644
--- a/bitcoin/Makefile
+++ b/bitcoin/Makefile
@@ -17,21 +17,27 @@ USE_LANGUAGES=	c c++
 AUTO_MKDIRS=	yes
 GNU_CONFIGURE=  yes
 
-# TODO: explain why this is necessary
-CXXFLAGS+=	-std=c++0x -I${BUILDLINK_PREFIX.boost-libs}/include/boost
+# TODO: Explain why this is necessary.
+CFLAGS+=        -fPIC
+# TODO: Explain why this is necessary.
+CXXFLAGS+=	-std=c++0x
+
+# TODO: Explain why these are necessary.
+CPPFLAGS+=	-I${BUILDLINK_PREFIX.boost-headers}/include/boost, -Wl,-R${BUILDLINK_PREFIX.boost-libs}/lib/bitcoin
+CPPFLAGS+=	-L${BUILDLINK_PREFIX.boost-libs}/lib/bitcoin
+CFLAGS+=	-Wl,-R${BUILDLINK_PREFIX.boost-libs}/lib/bitcoin -L${BUILDLINK_PREFIX.boost-libs}/lib/bitcoin
 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
 
-# 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
-CPPFLAGS+=-L${BUILDLINK_PREFIX.boost-libs}/lib/bitcoin
+# configure does not look in PREFIX for boost unless instructed.
 CONFIGURE_ARGS+=  --with-boost=${BUILDLINK_PREFIX.boost-libs}
+# TODO: Explain why this is necessary; the -I of the include dir
+# should be present, and bitcoin's configure should know about what
+# appears to be a standard include sub-directory.
+CXXFLAGS+=	-I${BUILDLINK_PREFIX.boost-libs}/include/boost
 
 CONFIGURE_ARGS+=  --enable-hardening
 
-# TODO: explain why adding a prefix without a -- command makes sense
-CONFIGURE_ARGS+=  ${PREFIX}/include/db4
-# TODO: explain why this is necessary
+# pkgsrc's db4 package installs as db4_, but bitcoin looks for db_.
 BUILDLINK_TRANSFORM+=   l:db_cxx:db4_cxx
 
 RCD_SCRIPTS=	bitcoind