open-iscsi: fix compilation when openslp is installed.

Two main issues:
1. open-iscsi build system, inside Makefile, user target, calls
   ./configure (which is very bad itself) without letting to choose
   configure options. Fixed in:
   open-iscsi-2.0.872-omg-calling-configure.patch
2. when openslp support is automagically enabled, -lslp didn't get
   added to compiler arguments. Fixed in:
   open-iscsi-2.0.872-slp.patch

Peace.
cleanup-cruft
Fabio Erculiani 14 years ago
parent c9dc25bb55
commit c579bd1194

@ -685,8 +685,13 @@ compile_iscsi() {
gen_die "ISCSI directory ${ISCSI_DIR} invalid"
print_info 1 'iSCSI: >> Compiling...'
cd "${TEMP}/${ISCSI_DIR}"
apply_patches iscsi ${ISCSI_VER}
# Only build userspace
print_info 1 'iSCSI: >> Configuring userspace...'
cd utils/open-isns || gen_die 'Could not enter open-isns dir'
./configure --without-slp >> ${LOGFILE} 2>&1 || gen_die 'Could not configure userspace'
cd ../.. || gen_die 'wtf?'
MAKE=${UTILS_MAKE} compile_generic "user" ""
# if kernel modules exist, copy them to initramfs, otherwise it will be compiled into the kernel

@ -0,0 +1,11 @@
--- open-iscsi-2.0-872.orig/Makefile
+++ open-iscsi-2.0-872/Makefile
@@ -27,7 +27,7 @@ IFACEFILES = etc/iface.example
all: user kernel
user: ;
- cd utils/open-isns; ./configure; $(MAKE)
+ cd utils/open-isns; $(MAKE)
$(MAKE) -C utils/sysdeps
$(MAKE) -C utils/fwparam_ibft
$(MAKE) -C usr

@ -0,0 +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
else
WITH_SLP=yes
- CPPFLAGS="$CPPFLAGS -I${withval}"
+ CPPFLAGS="$CPPFLAGS -I${withval} -lslp"
LDFLAGS="$LDFLAGS -L${withval}"
fi
]
Loading…
Cancel
Save