]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
openssl: Make sure we perform a parallel build
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 May 2023 13:40:07 +0000 (13:40 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 May 2023 13:40:07 +0000 (13:40 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
openssl/openssl.nm

index 58d932b1ad80d42b15c80a2cd13f21469d1dda1e..76d2dffc7d001f0cb378184a2ec5d85f6c305e13 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = openssl
 version    = 3.0.8
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Libraries
@@ -54,7 +54,7 @@ build
                ssl_arch += enable-ec_nistp_64_gcc_128
        end
 
-       build
+       configure = \
                ./Configure \
                        --prefix=%{prefix} \
                        --libdir=%{libdir} \
@@ -72,19 +72,16 @@ build
                        ${CFLAGS} \
                        ${LDFLAGS}
 
-               make all
+       test
+               make test
+       end
 
+       install
                # Clean up the .pc files
                for i in libcrypto.pc libssl.pc openssl.pc; do
                        sed -i '/^Libs.private:/{s/-L[^ ]* //;s/-Wl[^ ]* //}' $i
                done
-       end
 
-       test
-               make test
-       end
-
-       install
                make install DESTDIR=%{BUILDROOT}
 
                # Remove dist config
@@ -102,8 +99,6 @@ packages
 
                requires += ca-certificates
 
-               conflicts += %{name} < %{thisver}
-
                files += %{libdir}/openssl %{libdir}/engines*
        end