openssl update from 3.2.1 to 3.3.0 changed pkg-config generators and libdir changed from /usr/lib to /lib. This breaks builds of recipes which use openssl pkg-config files for library install etc paths. For example meta-security tpm2-openssl fails to build:
ERROR: mc:trs-qemuarm64:tpm2-openssl-1.1.1-r0 do_package: QA Issue: tpm2-openssl: Files/directories were installed but not shipped in any package: /usr/ossl-modules/tpm2.so Affected pkg-config files are: libssl.pc, openssl.pc and libcrypto.pc Fix this by hard coding LIBDIR variable to "lib". Prefix should be correctly used as before. Signed-off-by: Mikko Rapeli <mikko.rap...@linaro.org> --- .../openssl/openssl_pkg-config_libdir.patch | 31 +++++++++++++++++++ .../openssl/openssl_3.3.0.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/openssl_pkg-config_libdir.patch diff --git a/meta/recipes-connectivity/openssl/openssl/openssl_pkg-config_libdir.patch b/meta/recipes-connectivity/openssl/openssl/openssl_pkg-config_libdir.patch new file mode 100644 index 0000000000..e3b4249a69 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/openssl_pkg-config_libdir.patch @@ -0,0 +1,31 @@ +openssl: fix pkg-config file libdir from /usr back to /usr/lib + +openssl update from 3.2.1 to 3.3.0 changed pkg-config generators +and libdir changed from /usr/lib to /lib. This breaks builds +of recipes which use openssl pkg-config files for library install +etc paths. For example meta-security tpm2-openssl fails to build: + +ERROR: mc:trs-qemuarm64:tpm2-openssl-1.1.1-r0 do_package: QA Issue: tpm2-openssl: Files/directories were installed but not shipped in any package: + /usr/ossl-modules/tpm2.so + +Affected pkg-config files are: libssl.pc, openssl.pc and libcrypto.pc + +Fix this by hard coding LIBDIR variable to "lib". Prefix should +be correctly used as before. + +Upstream-Status: Inappropriate [configuration change] + +Signed-off-by: Mikko Rapeli <mikko.rap...@linaro.org> + +--- a/exporters/build.info ++++ b/exporters/build.info +@@ -19,7 +19,7 @@ DEPEND[openssl.pc]=libcrypto.pc libssl.pc + DEPEND[""]=openssl.pc + + GENERATE[../installdata.pm]=../util/mkinstallvars.pl \ +- "PREFIX=$(INSTALLTOP)" BINDIR=bin "LIBDIR=$(LIBDIR)" \ ++ "PREFIX=$(INSTALLTOP)" BINDIR=bin LIBDIR=lib \ + INCLUDEDIR=include APPLINKDIR=include/openssl \ + "ENGINESDIR=$(ENGINESDIR)" "MODULESDIR=$(MODULESDIR)" \ + "PKGCONFIGDIR=$(PKGCONFIGDIR)" "CMAKECONFIGDIR=$(CMAKECONFIGDIR)" \ + diff --git a/meta/recipes-connectivity/openssl/openssl_3.3.0.bb b/meta/recipes-connectivity/openssl/openssl_3.3.0.bb index 2cdaf4c75d..5ee8375ebc 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.3.0.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.3.0.bb @@ -13,6 +13,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-Configure-do-not-tweak-mips-cflags.patch \ file://0001-Added-handshake-history-reporting-when-test-fails.patch \ file://bti.patch \ + file://openssl_pkg-config_libdir.patch \ " SRC_URI:append:class-nativesdk = " \ -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#198969): https://lists.openembedded.org/g/openembedded-core/message/198969 Mute This Topic: https://lists.openembedded.org/mt/105885236/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
