aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgen_compile.sh3
-rw-r--r--patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch14
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
]
+ )