From bf2c6ad6782df5963101bc3e73c0d31d65e0829f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 25 Jul 2022 08:55:56 +0100 Subject: gentoo auto-resync : 25:07:2022 - 08:55:56 --- dev-libs/libtpms/Manifest | 3 +- .../libtpms/files/libtpms-0.9.5-slibtool.patch | 52 ++++++++++++++++++++++ dev-libs/libtpms/libtpms-0.9.5.ebuild | 1 + 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 dev-libs/libtpms/files/libtpms-0.9.5-slibtool.patch (limited to 'dev-libs/libtpms') diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest index f8f60df4a867..872e69e292fa 100644 --- a/dev-libs/libtpms/Manifest +++ b/dev-libs/libtpms/Manifest @@ -1,6 +1,7 @@ AUX libtpms-0.9.0-Remove-WError.patch 508 BLAKE2B 33178598a1fef1189039c30814996f00ec37215b3f10a0ff9df521a866147b2a6844d86c3b372e450f701e6e2ae3e587443765c39848076536861342e5b42d63 SHA512 e0d55045bcb667278dc1ae1c509b7be466f23421683f8b0b7c830d724f83b1923b09a61f2a8e649e08150d1d313f0456cfc5f5a1b5fe3bf168565e443595dd12 +AUX libtpms-0.9.5-slibtool.patch 1981 BLAKE2B fa4adf1c063d24a2550f964dcaae1ea2e2d93f7d2704bc00e29ef22ceecaaf214860e82e668e1358854482fcf3ba1af89745422657763b7683a232f7e286ac7e SHA512 4b8eebc895ce6941a3ad5995ee0d5f1b1537861700878fa1ce0a95ec37ee1d51354782da4bb2feeedc1c5871aa62ec248484b409c6109bed95cf73962ff8b206 DIST libtpms-0.9.4.tar.gz 1264030 BLAKE2B 56731b913145afcd49fae13f0fcbe4fc147edf206a44849cef45ed34a7644f0894bb6ab5dcb72d620eb1ab121bf4e821fe7893557508af394585171133d659e2 SHA512 ae3e2613bc31d98c10def546c70d0c25bd1246af5090268afa0411502bfd0e454967046ebcd9025350976817441e595fa4e21562f800285db98331e4c2743505 DIST libtpms-0.9.5.tar.gz 1264086 BLAKE2B 3e6da08dd31414bdf19260f47fce6ba7ace0ae72b152b681f1c1fbc9d75b7708238e5c2a161827c7a6e2b9a6ae4786dfbf921ec37b9f0b7c044835c974a111a3 SHA512 96b8d6dd66a6c4bc7b72d172d0b75444c7725a7fb5b0f792cd1cff9d8f7ec894c51e94493816f033198cc8adf2f95cf473629431dadb70b423068d834de09e21 EBUILD libtpms-0.9.4.ebuild 1299 BLAKE2B 6c78609afdc5385a842da2f415ef918475baab3da737cb2e43c72cf5d2aaa382dd84b4157e4b52aa7fa5f44de6db48b37f680897baabb006d923589d4ca39552 SHA512 f54857978f2f4d021055406f2f2f480f3df97ca57cf29b1967389107079cbe37551ac8717c03fdbf38cb4aa64b5567a87f27bd2ed46edd0243d076c06689f3b1 -EBUILD libtpms-0.9.5.ebuild 1304 BLAKE2B a59602976b1c6564c1a75dd97418dc35c9537e4adc997e8a6ac63ec833a9d8d4e154425d9ea82311cbadade514a26a60e8c5b7ae2008f434c1b9ee0568c239b8 SHA512 59fe0fa80df39422df62858552384ae88613a7d037ec1ac9de3687d80959903a3d422c11fd6f6ac196eab9d75573003ca9f2adca59d28f1034e8d7a619b43d31 +EBUILD libtpms-0.9.5.ebuild 1355 BLAKE2B 5ebf0b1933ea18d93eaf81f76dc6edfecbdc1860db0487df425e30a2464eaf7f691f6e99c15fcc460dd16a2670587dbc86084de55db961a0d6eede12474e826d SHA512 652400488933cc1c96cc610f2da96e5846fa1fd8b74b573d778277f68abb5a0991fd9d56f574404b3a8a2653dcffa6f4b87813abe7ee62abdb6950fdd69853d7 MISC metadata.xml 536 BLAKE2B 75236814e21cb3e98feaa2646ccf680973a71e168d5ccd95cdd12f06214a1b18454cb40b1825df9335e3c4881b7d8d3cffdf03c48dcedd99da4a0dd50d81fe1b SHA512 3abebe84fc62f5082d22e0a3d146a22e7e799d0b1d0f3cfa282aac408ca8c0b8f396f7b081c92aec290037bb7405e672ce7f6f4f8da5b1966a0b4eda8005d721 diff --git a/dev-libs/libtpms/files/libtpms-0.9.5-slibtool.patch b/dev-libs/libtpms/files/libtpms-0.9.5-slibtool.patch new file mode 100644 index 000000000000..7e83434db151 --- /dev/null +++ b/dev-libs/libtpms/files/libtpms-0.9.5-slibtool.patch @@ -0,0 +1,52 @@ +Bug: https://bugs.gentoo.org/858671 +Upstream-PR: https://github.com/stefanberger/libtpms/pull/344 +Upstream-Commit: https://github.com/stefanberger/libtpms/commit/0c2bc32a21e2c7218faa8cd6d5cf31b13835e6d5 + +From 343f1b21b36fe98daf31c355ebc12902ba7e162a Mon Sep 17 00:00:00 2001 +From: orbea +Date: Fri, 15 Jul 2022 17:02:43 -0700 +Subject: [PATCH] tests: Fix the build with slibtool + +When building the tests with `make check` and slibtool the tests will +then all fail to load libtpms.so.0. + + $ ./base64decode + /tmp/libtpms/tests/.libs/base64decode: error while loading shared libraries: libtpms.so.0: cannot open shared object file: No such file or directory + +This happens because they are linked with -ltpms rather than the +libtpms.la file which has unexpected results with slibtool. GNU libtool +does some magic to make this work while slibtool fails to link the +dependency. + +The correct way to link internal dependencies is directly with the +libtool archive (.la) files where the -lfoo linker flags should be only +used with external dependencies. Additionally -no-undefined is added to +the LDFLAGS to ensure there aren't undefined references in the future. + +Note: + +* This doesn't happen if libtpms is installed to the system and the tests + find the already installs libtpms rather than the newly built library. + +* GNU libtool silently ignores -no-undefined, but slibtool will respect + it. + +Signed-off-by: orbea +--- + tests/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index eb23c59a4..d3d831938 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -10,7 +10,8 @@ TESTS_ENVIRONMENT = \ + abs_top_srcdir=`cd '$(top_srcdir)'; pwd` + + AM_CFLAGS = -I$(top_srcdir)/include $(SANITIZERS) +-AM_LDFLAGS = -ltpms -L$(top_builddir)/src/.libs $(SANITIZERS) ++AM_LDFLAGS = -no-undefined $(SANITIZERS) ++LDADD = $(top_builddir)/src/libtpms.la + + check_PROGRAMS = \ + base64decode diff --git a/dev-libs/libtpms/libtpms-0.9.5.ebuild b/dev-libs/libtpms/libtpms-0.9.5.ebuild index fc15af9bf0f4..4db20b1b4c77 100644 --- a/dev-libs/libtpms/libtpms-0.9.5.ebuild +++ b/dev-libs/libtpms/libtpms-0.9.5.ebuild @@ -18,6 +18,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}-0.9.0-Remove-WError.patch" + "${FILESDIR}/${PN}-0.9.5-slibtool.patch" # 858671 ) src_prepare() { -- cgit v1.2.3