[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

[Mike Frysinger]

commit:     449cec71c892a45e0c43aa1019d5e08b6337d059
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 23:56:48 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 00:00:05 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=449cec71

sys-block/open-iscsi: fix handling of user CPPFLAGS

 sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
index 4392860..05d9790 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
@@ -52,6 +52,8 @@ src_prepare() {
 }
 
 src_configure() {
+	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
+
 	cd utils/open-isns || die
 
 	# SSL (--with-security) is broken
@@ -60,11 +62,11 @@ src_configure() {
 }
 
 src_compile() {
-	use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI
-
+	# Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
+	# is messed up already here, so it's not making it that much worse.
 	KSRC="${KV_DIR}" CFLAGS="" \
 	emake \
-		OPTFLAGS="${CFLAGS}" \
+		OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \
 		AR="$(tc-getAR)" CC="$(tc-getCC)" \
 		user
 }