Attachment #443974 for bug #558366




src_prepare() {
	epatch "${FILESDIR}"/${P}-Makefiles.patch
	epatch "${FILESDIR}"/${P}-memset.patch
	epatch "${FILESDIR}"/${P}-isns-slp.patch

	sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
}

}

src_compile() {
	local SLP_LIBS
	use slp && SLP_LIBS="-lslp"

	# 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} ${CPPFLAGS}" \
		AR="$(tc-getAR)" CC="$(tc-getCC)" \
		SLP_LIBS="${SLP_LIBS}" \
		user
}


Return to bug 558366

Lines 62-67 Link Here

(-)/usr/portage/portage/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild (+5 lines)
62	src_prepare() {	62	src_prepare() {
63	epatch "${FILESDIR}"/${P}-Makefiles.patch	63	epatch "${FILESDIR}"/${P}-Makefiles.patch
64	epatch "${FILESDIR}"/${P}-memset.patch	64	epatch "${FILESDIR}"/${P}-memset.patch
		65	epatch "${FILESDIR}"/${P}-isns-slp.patch
65		66
66	sed -i -e 's:^\(iscsid.startup\)\s=.:\1 = /usr/sbin/iscsid:' etc/iscsid.conf \|\| die	67	sed -i -e 's:^\(iscsid.startup\)\s=.:\1 = /usr/sbin/iscsid:' etc/iscsid.conf \|\| die
67	}	68	}
Lines 78-89 Link Here
78	}	79	}
79		80
80	src_compile() {	81	src_compile() {
		82	local SLP_LIBS
		83	use slp && SLP_LIBS="-lslp"
		84
81	# Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build	85	# Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
82	# is messed up already here, so it's not making it that much worse.	86	# is messed up already here, so it's not making it that much worse.
83	KSRC="${KV_DIR}" CFLAGS="" \	87	KSRC="${KV_DIR}" CFLAGS="" \
84	emake \	88	emake \
85	OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \	89	OPTFLAGS="${CFLAGS} ${CPPFLAGS}" \
86	AR="$(tc-getAR)" CC="$(tc-getCC)" \	90	AR="$(tc-getAR)" CC="$(tc-getCC)" \
		91	SLP_LIBS="${SLP_LIBS}" \
87	user	92	user
88	}	93	}
89		94