diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2012-02-09 08:29:45 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2012-02-09 08:29:45 +0000 |
| commit | c71a9b95cd943b77bf03885f71b279a2c4b021f1 (patch) | |
| tree | 95c881bd4282ec49be26b5bf3e4446bdb4951b59 /sys-block | |
| parent | The init script fails on a machine with multiple non-lo interfaces as route o... (diff) | |
| download | gentoo-2-c71a9b95cd943b77bf03885f71b279a2c4b021f1.tar.gz gentoo-2-c71a9b95cd943b77bf03885f71b279a2c4b021f1.tar.bz2 gentoo-2-c71a9b95cd943b77bf03885f71b279a2c4b021f1.zip | |
Bug #383437: Fix iSNS SLP linking in the main binaries.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'sys-block')
| -rw-r--r-- | sys-block/open-iscsi/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch | 16 | ||||
| -rw-r--r-- | sys-block/open-iscsi/open-iscsi-2.0.872.ebuild | 9 |
3 files changed, 27 insertions, 4 deletions
diff --git a/sys-block/open-iscsi/ChangeLog b/sys-block/open-iscsi/ChangeLog index c83df6f11e5b..4098cad51e48 100644 --- a/sys-block/open-iscsi/ChangeLog +++ b/sys-block/open-iscsi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-block/open-iscsi # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.38 2012/02/01 14:21:56 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/ChangeLog,v 1.39 2012/02/09 08:29:45 robbat2 Exp $ + + 09 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> open-iscsi-2.0.872.ebuild, + +files/open-iscsi-2.0.872-isns-slp.patch: + Bug #383437: Fix iSNS SLP linking in the main binaries. 01 Feb 2012; Brent Baude <ranger@gentoo.org> open-iscsi-2.0.871.3.ebuild: Marking open-iscsi-2.0.871.3 ppc for bug 370679 diff --git a/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch b/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch new file mode 100644 index 000000000000..db280a3dd862 --- /dev/null +++ b/sys-block/open-iscsi/files/open-iscsi-2.0.872-isns-slp.patch @@ -0,0 +1,16 @@ +diff -Nuar open-iscsi-2.0-872.orig/usr/Makefile open-iscsi-2.0-872/usr/Makefile +--- open-iscsi-2.0-872.orig/usr/Makefile 2012-02-09 08:25:13.656604152 +0000 ++++ open-iscsi-2.0-872/usr/Makefile 2012-02-09 08:26:28.960171260 +0000 +@@ -53,10 +53,10 @@ + + iscsid: $(ISCSI_LIB_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ + iscsid.o session_mgmt.o discoveryd.o +- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns $(SLP_LIBS) -lcrypto + + iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o +- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -L../utils/open-isns -lisns $(SLP_LIBS) -lcrypto + + iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ + iscsistart.o statics.o diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild index 839054a624bd..cfcc3c9f78a4 100644 --- a/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild +++ b/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild,v 1.3 2011/11/05 23:03:00 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/open-iscsi/open-iscsi-2.0.872.ebuild,v 1.4 2012/02/09 08:29:45 robbat2 Exp $ EAPI=2 inherit versionator linux-info eutils flag-o-matic @@ -45,6 +45,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-glibc212.patch epatch "${FILESDIR}"/${P}-dont-call-configure.patch epatch "${FILESDIR}"/${P}-ldflags.patch + epatch "${FILESDIR}"/${P}-isns-slp.patch } src_configure() { @@ -56,8 +57,10 @@ src_compile() { use debug && append-flags -DDEBUG_TCP -DDEBUG_SCSI einfo "Building userspace" + local SLP_LIBS + use slp && SLP_LIBS="-lslp" cd "${S}" && \ - KSRC="${KV_DIR}" CFLAGS="" emake OPTFLAGS="${CFLAGS}" user \ + KSRC="${KV_DIR}" CFLAGS="" emake OPTFLAGS="${CFLAGS}" SLP_LIBS="${SLP_LIBS}" user \ || die "emake failed" } |