From: "Fabio Erculiani" <lxnay@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/genkernel:master commit in: /, patches/iscsi/2.0-872/
Date: Tue, 22 Mar 2011 18:24:47 +0000 (UTC) [thread overview]
Message-ID: <ad2842f6701c0eea0666a4b2e510f1cd078de6fe.lxnay@gentoo> (raw)
commit: ad2842f6701c0eea0666a4b2e510f1cd078de6fe
Author: Fabio Erculiani <lxnay <AT> sabayon <DOT> org>
AuthorDate: Tue Mar 22 18:23:59 2011 +0000
Commit: Fabio Erculiani <lxnay <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 18:23:59 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ad2842f6
iSCSI: open-iscsi patchwork: add -lslp to LDFLAGS, and properly call autoconf
---
gen_compile.sh | 3 +++
patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch | 14 +++++++-------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/gen_compile.sh b/gen_compile.sh
index 00b5de9..ec752ce 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -690,6 +690,9 @@ compile_iscsi() {
# Only build userspace
print_info 1 'iSCSI: >> Configuring userspace...'
cd utils/open-isns || gen_die 'Could not enter open-isns dir'
+ # we currently have a patch that changes configure.ac
+ # once given patch is dropped, drop autoconf too
+ autoconf || gen_die 'Could not tweak open-iscsi configuration'
./configure --without-slp >> ${LOGFILE} 2>&1 || gen_die 'Could not configure userspace'
cd ../.. || gen_die 'wtf?'
MAKE=${UTILS_MAKE} compile_generic "user" ""
diff --git a/patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch b/patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch
index 16658f3..51ca3e5 100644
--- a/patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch
+++ b/patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch
@@ -1,11 +1,11 @@
---- open-iscsi-2.0-872.orig/utils/open-isns/configure.ac
-+++ open-iscsi-2.0-872/utils/open-isns/configure.ac
-@@ -79,7 +79,7 @@ AC_ARG_WITH(slp,
- WITH_SLP=$withval
+--- a/utils/open-isns/configure.ac
++++ b/utils/open-isns/configure.ac
+@@ -80,7 +80,7 @@ AC_ARG_WITH(slp,
else
WITH_SLP=yes
-- CPPFLAGS="$CPPFLAGS -I${withval}"
-+ CPPFLAGS="$CPPFLAGS -I${withval} -lslp"
- LDFLAGS="$LDFLAGS -L${withval}"
+ CPPFLAGS="$CPPFLAGS -I${withval}"
+- LDFLAGS="$LDFLAGS -L${withval}"
++ LDFLAGS="$LDFLAGS -L${withval} -lslp"
fi
]
+ )
next reply other threads:[~2011-03-22 18:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-22 18:24 Fabio Erculiani [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-03-22 12:04 [gentoo-commits] proj/genkernel:master commit in: /, patches/iscsi/2.0-872/ Fabio Erculiani
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ad2842f6701c0eea0666a4b2e510f1cd078de6fe.lxnay@gentoo \
--to=lxnay@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox