openssl: Install libraries to /usr/lib64 on aarch64

Also don't try moving engines when none exist

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/openssl/openssl.nm b/openssl/openssl.nm
index d9848e41b5ef0df1b94b31a1cbc3487fcfc0abea..9f3a85a26b63fa24106709cf1001fbc7b03fabcc 100644 (file)
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -5,7 +5,7 @@
 
 name       = openssl
 version    = 1.0.2d
-release    = 2
+release    = 3
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Libraries
@@ -103,8 +103,10 @@ build
                mkdir -pv %{BUILDROOT}/usr/share
                mv -v %{BUILDROOT}/etc/pki/tls/man %{BUILDROOT}/usr/share/
 
-               mkdir -pv %{BUILDROOT}%{libdir}/openssl
-               mv -v %{BUILDROOT}%{libdir}/engines %{BUILDROOT}%{libdir}/openssl
+               if [ -d "%{BUILDROOT}%{libdir}/engines" ]; then
+                       mkdir -pv %{BUILDROOT}%{libdir}/openssl
+                       mv -v %{BUILDROOT}%{libdir}/engines %{BUILDROOT}%{libdir}/openssl
+               fi
 
                mkdir -pv %{BUILDROOT}/etc/pki/CA/private
                chmod -v 700 -R %{BUILDROOT}/etc/pki/CA

diff --git a/openssl/patches/openssl-1.0.2c-rpmbuild.patch b/openssl/patches/openssl-1.0.2c-rpmbuild.patch
index 555010c5b9740e3335af1eb8a9d236c0cac92ffa..d6149625b06c5264c8e8b02b7aeb1d0dd6ac786e 100644 (file)
--- a/openssl/patches/openssl-1.0.2c-rpmbuild.patch
+++ b/openssl/patches/openssl-1.0.2c-rpmbuild.patch
@@ -19,7 +19,7 @@ diff -up openssl-1.0.2c/Configure.rpmbuild openssl-1.0.2c/Configure
 -"linux-armv4",        "gcc: -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 -"linux-aarch64","gcc: -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"linux-armv4",        "gcc:-Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
-+"linux-aarch64","gcc:-DL_ENDIAN -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)",
++"linux-aarch64","gcc:-DL_ENDIAN -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER):::64",
  # Configure script adds minimally required -march for assembly support,
  # if no -march was specified at command line. mips32 and mips64 below
  # refer to contemporary MIPS Architecture specifications, MIPS32 and