[gentoo-commits] repo/gentoo:master commit in: app-crypt/swtpm/, app-crypt/swtpm/files/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     4df6f3fab16075c5e69d3e0d54bd52538878b939
Author:     Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Fri May 10 02:26:00 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri May 10 07:54:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df6f3fa

app-crypt/swtpm: Fix build with slibtool

Closes: https://bugs.gentoo.org/931269
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36625
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-crypt/swtpm/files/swtpm-0.8.2-slibtool.patch | 24 ++++++++++++++++++++++++
 app-crypt/swtpm/swtpm-0.8.2.ebuild               |  1 +
 2 files changed, 25 insertions(+)

diff --git a/app-crypt/swtpm/files/swtpm-0.8.2-slibtool.patch b/app-crypt/swtpm/files/swtpm-0.8.2-slibtool.patch
new file mode 100644
index 000000000000..abf0d3dbe29c
--- /dev/null
+++ b/app-crypt/swtpm/files/swtpm-0.8.2-slibtool.patch
@@ -0,0 +1,24 @@
+diff --git a/src/swtpm_localca/Makefile.am b/src/swtpm_localca/Makefile.am
+index 74532a8..41b61ec 100644
+--- a/src/swtpm_localca/Makefile.am
++++ b/src/swtpm_localca/Makefile.am
+@@ -30,7 +30,6 @@ swtpm_localca_LDADD = \
+ 	$(top_builddir)/src/utils/libswtpm_utils.la
+ 
+ swtpm_localca_LDFLAGS = \
+-	-L$(top_builddir)/src/utils -lswtpm_utils \
+ 	$(MY_LDFLAGS) \
+ 	$(GLIB_LIBS) \
+ 	$(GMP_LIBS) \
+diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am
+index c0f916b..61188c9 100644
+--- a/src/swtpm_setup/Makefile.am
++++ b/src/swtpm_setup/Makefile.am
+@@ -32,7 +32,6 @@ swtpm_setup_LDADD = \
+ 	$(top_builddir)/src/utils/libswtpm_utils.la
+ 
+ swtpm_setup_LDFLAGS = \
+-	-L$(top_builddir)/src/utils -lswtpm_utils \
+ 	$(MY_LDFLAGS) \
+ 	$(HARDENING_LDFLAGS) \
+ 	$(GLIB_LIBS) \

diff --git a/app-crypt/swtpm/swtpm-0.8.2.ebuild b/app-crypt/swtpm/swtpm-0.8.2.ebuild
index a1857927a41f..1740dd4e204e 100644
--- a/app-crypt/swtpm/swtpm-0.8.2.ebuild
+++ b/app-crypt/swtpm/swtpm-0.8.2.ebuild
@@ -46,6 +46,7 @@ BDEPEND="${PYTHON_DEPS}"
 PATCHES=(
 	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
 	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
+	"${FILESDIR}/${PN}-0.8.2-slibtool.patch"
 )
 
 src_prepare() {