openssl: fix ssl2 rootfile handling.

KCFG will added to the lfs filename at determine the filename in config/rootfiles folder.

diff --git a/lfs/openssl b/lfs/openssl
index 699f3603dc7b93364798ad790bf3ea6644621f16..9cc1b4b0f5a64bda04a1b68eebfcf68ec311243e 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -31,11 +31,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-ifeq "$(SSE2)" "1"
-       TARGET = $(DIR_INFO)/$(THISAPP)-sse2
-else
-       TARGET = $(DIR_INFO)/$(THISAPP)
-endif
+TARGET = $(DIR_INFO)/$(THISAPP)$(KCFG)
 
 CFLAGS += -DPURIFY
 export RPM_OPT_FLAGS = $(CFLAGS)
@@ -60,7 +56,7 @@ CONFIGURE_OPTIONS = \
 ifeq "$(MACHINE)" "i586"
        CONFIGURE_OPTIONS += linux-elf
 
-ifneq "$(SSE2)" "1"
+ifneq "$(KCFG)" "-sse2"
        CONFIGURE_OPTIONS += no-sse2
 endif
 endif
@@ -124,7 +120,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make depend
        cd $(DIR_APP) && make
 
-ifeq "$(SSE2)" "1"
+ifeq "$(KCFG)" "-sse2"
        -mkdir -pv /usr/lib/sse2
        cd $(DIR_APP) && install -m 755 \
                libcrypto.so.10 libssl.so.10 /usr/lib/sse2

diff --git a/make.sh b/make.sh
index 1992c02bf87e7b8b38101e4d0d585c022e73ca81..db40b563e85cc48c106d6c6d29b8f87e25a92aa5 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -461,7 +461,7 @@ buildipfire() {
   esac
   ipfiremake xtables-addons                    USPACE="1"
   ipfiremake openssl
-  [ "${TARGET_ARCH}" = "i586" ] && ipfiremake openssl SSE2="1"
+  [ "${TARGET_ARCH}" = "i586" ] && ipfiremake openssl KCFG='-sse2'
   ipfiremake libgpg-error
   ipfiremake libgcrypt
   ipfiremake libassuan