diff options
| author |   Dawid Węgliński <cla@gentoo.org> | 2010-09-27 11:46:12 +0000 |
|---|---|---|
| committer | Dawid Węgliński <cla@gentoo.org> | 2010-09-27 11:46:12 +0000 |
| commit | 763d2a12659813afa31ca13923f658c031b94655 (patch) | |
| tree | 43e0973410489603482ce853169be70568acf415 /sys-block | |
| parent | Version bump net-misc/openvpn to 2.1.3. (diff) | |
| download | gentoo-2-763d2a12659813afa31ca13923f658c031b94655.tar.gz gentoo-2-763d2a12659813afa31ca13923f658c031b94655.tar.bz2 gentoo-2-763d2a12659813afa31ca13923f658c031b94655.zip | |
Respect user defined LDFLAGS (bug #337923)
(Portage version: 2.2_rc78/cvs/Linux x86_64)
Diffstat (limited to 'sys-block')
3 files changed, 43 insertions, 5 deletions
diff --git a/sys-block/iscsi-initiator-core-tools/ChangeLog b/sys-block/iscsi-initiator-core-tools/ChangeLog index 5e48f85b4305..65fa0b743beb 100644 --- a/sys-block/iscsi-initiator-core-tools/ChangeLog +++ b/sys-block/iscsi-initiator-core-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-block/iscsi-initiator-core-tools -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsi-initiator-core-tools/ChangeLog,v 1.6 2009/09/23 20:30:33 patrick Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsi-initiator-core-tools/ChangeLog,v 1.7 2010/09/27 11:46:12 cla Exp $ + + 27 Sep 2010; Dawid Węgliński <cla@gentoo.org> + iscsi-initiator-core-tools-2.3.ebuild, +files/fix-ldflags.patch: + Respect user defined LDFLAGS (bug #337923) 23 Sep 2009; Patrick Lauer <patrick@gentoo.org> iscsi-initiator-core-tools-2.3.ebuild: diff --git a/sys-block/iscsi-initiator-core-tools/files/fix-ldflags.patch b/sys-block/iscsi-initiator-core-tools/files/fix-ldflags.patch new file mode 100644 index 000000000000..b0224f53dab3 --- /dev/null +++ b/sys-block/iscsi-initiator-core-tools/files/fix-ldflags.patch @@ -0,0 +1,28 @@ +diff -Naur iscsi-initiator-core-tools-2.3.old/ipyxd/Makefile iscsi-initiator-core-tools-2.3/ipyxd/Makefile +--- iscsi-initiator-core-tools-2.3.old/ipyxd/Makefile 2005-04-01 10:35:54.000000000 +0200 ++++ iscsi-initiator-core-tools-2.3/ipyxd/Makefile 2010-09-27 13:39:25.000000000 +0200 +@@ -51,19 +51,19 @@ + fi + + ${MD5}.o : ${SRC}${MD5}.c +- ${CC} ${AUTHFLAGS} -c $< ++ ${CC} ${LDFLAGS} ${AUTHFLAGS} -c $< + + ${CHAP}.o : ${SRC}${CHAP}.c +- ${CC} ${AUTHFLAGS} -c $< ++ ${CC} ${LDFLAGS} ${AUTHFLAGS} -c $< + + ${AUTH} : ${SRC}${AUTH}.c +- ${CC} ${AUTHFLAGS} -o $@ $< ${LOBJECTS} ${AUTHLIBS} ++ ${CC} ${LDFLAGS} ${AUTHFLAGS} -o $@ $< ${LOBJECTS} ${AUTHLIBS} + + ${INIT} : ${SRC}${INIT}.c +- ${CC} ${DEBUGFLAGS} ${INCLUDE} -o $@ $< ++ ${CC} ${LDFLAGS} ${DEBUGFLAGS} ${INCLUDE} -o $@ $< + + ${INAME} : ${SRC}${INAME}.c +- ${CC} ${DEBUGFLAGS} ${INCLUDE} -o $@ $< ${MD5}.o ++ ${CC} ${LDFLAGS} ${DEBUGFLAGS} ${INCLUDE} -o $@ $< ${MD5}.o + + devpts: + $(RM) -rf $(DESTDIR)/dev/iscsi diff --git a/sys-block/iscsi-initiator-core-tools/iscsi-initiator-core-tools-2.3.ebuild b/sys-block/iscsi-initiator-core-tools/iscsi-initiator-core-tools-2.3.ebuild index 205e168f8366..552eb7334cff 100644 --- a/sys-block/iscsi-initiator-core-tools/iscsi-initiator-core-tools-2.3.ebuild +++ b/sys-block/iscsi-initiator-core-tools/iscsi-initiator-core-tools-2.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsi-initiator-core-tools/iscsi-initiator-core-tools-2.3.ebuild,v 1.4 2009/09/23 20:30:33 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/iscsi-initiator-core-tools/iscsi-initiator-core-tools-2.3.ebuild,v 1.5 2010/09/27 11:46:12 cla Exp $ -inherit flag-o-matic +inherit eutils flag-o-matic DESCRIPTION="iscsi-initiator-core is a full featured iSCSI Initiator stack." #HOMEPAGE="http://iscsi-initiator-core.org/" @@ -15,6 +15,12 @@ IUSE="" DEPEND="" RDEPEND="${DEPEND}" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/fix-ldflags.patch" +} + src_compile() { cd "${S}"/ipyxd/ append-flags -DLINUX -Iinclude/ |