From: inoguchi <inoguchi@openbsd.org>
Date: Tue, 8 Jun 2021 11:19:39 +0000 (+0000)
Subject: Fix pkg-config .pc files with LibreSSL
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7599ce71154c89733ec637d43c506d060458ba96;p=openbsd

Fix pkg-config .pc files with LibreSSL

In libssl.pc, Libs: should not have '-lcrypto', and Requires.private:
should have it as 'libcrypto'.
openssl.pc does not need Libs: and Cflags:, but should have Requires:.

OK millert@
---

diff --git a/lib/libcrypto/generate_pkgconfig.sh b/lib/libcrypto/generate_pkgconfig.sh
index 12dff506ff0..e03f849e761 100644
--- a/lib/libcrypto/generate_pkgconfig.sh
+++ b/lib/libcrypto/generate_pkgconfig.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: generate_pkgconfig.sh,v 1.2 2016/09/03 12:42:46 beck Exp $
+# $OpenBSD: generate_pkgconfig.sh,v 1.3 2021/06/08 11:19:39 inoguchi Exp $
 #
 # Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org>
 #
@@ -69,7 +69,7 @@ includedir=\${prefix}/include
 Name: OpenSSL-libcrypto
 Description: OpenSSL cryptography library
 Version: ${lib_version}
-Requires: 
 Libs: -L\${libdir} -lcrypto
+Libs.private:
 Cflags: -I\${includedir}
 __EOF__
diff --git a/lib/libssl/generate_pkgconfig.sh b/lib/libssl/generate_pkgconfig.sh
index de14a121fc8..4bc22c3267f 100644
--- a/lib/libssl/generate_pkgconfig.sh
+++ b/lib/libssl/generate_pkgconfig.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: generate_pkgconfig.sh,v 1.9 2016/09/03 12:42:42 beck Exp $
+# $OpenBSD: generate_pkgconfig.sh,v 1.10 2021/06/08 11:19:39 inoguchi Exp $
 #
 # Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org>
 #
@@ -65,11 +65,11 @@ exec_prefix=\${prefix}
 libdir=\${exec_prefix}/lib
 includedir=\${prefix}/include
 
-Name: OpenSSL
+Name: OpenSSL-libssl
 Description: Secure Sockets Layer and cryptography libraries
 Version: ${lib_version}
-Requires: 
-Libs: -L\${libdir} -lssl -lcrypto
+Requires.private: libcrypto
+Libs: -L\${libdir} -lssl
 Cflags: -I\${includedir}
 __EOF__
 
@@ -84,7 +84,5 @@ includedir=\${prefix}/include
 Name: OpenSSL
 Description: Secure Sockets Layer and cryptography libraries and tools
 Version: ${lib_version}
-Requires: 
-Libs: -L\${libdir} -lssl -lcrypto
-Cflags: -I\${includedir}
+Requires: libssl libcrypto
 __EOF__