From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 8 May 2023 13:40:07 +0000 (+0000)
Subject: openssl: Make sure we perform a parallel build
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ff01db62f9e6b632aac1360fdea78d342be4311;p=ipfire-3.x.git

openssl: Make sure we perform a parallel build

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

diff --git a/openssl/openssl.nm b/openssl/openssl.nm
index 58d932b1a..76d2dffc7 100644
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -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