From 449cec71c892a45e0c43aa1019d5e08b6337d059 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 17 Dec 2015 18:56:48 -0500 Subject: [PATCH] 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 4392860d304d..05d979080711 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 } -- 2.26.2