summaryrefslogtreecommitdiff
path: root/app-crypt/tpm2-pkcs11/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-12-22 06:30:44 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-12-22 06:30:44 +0000
commit5a2cecfc8661e1d3a762adf05cf8eb142cd41710 (patch)
tree341806a72603cc8845e7e1595289e7a8b9570f2a /app-crypt/tpm2-pkcs11/files
parentd2bcdab82e5f5f38a8ab54026e8aa94edb1b77a6 (diff)
gentoo auto-resync : 22:12:2024 - 06:30:44HEADmaster
Diffstat (limited to 'app-crypt/tpm2-pkcs11/files')
-rw-r--r--app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.9.0-Remove-incorrect-append-in-configure-ac.patch26
-rw-r--r--app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.9.1-Fix-prefix-install-variable.patch13
2 files changed, 13 insertions, 26 deletions
diff --git a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.9.0-Remove-incorrect-append-in-configure-ac.patch b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.9.0-Remove-incorrect-append-in-configure-ac.patch
deleted file mode 100644
index 10272341fe42..000000000000
--- a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.9.0-Remove-incorrect-append-in-configure-ac.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 03bc2732826443328550358ba8f2c79195922bc8 Mon Sep 17 00:00:00 2001
-From: Christopher Byrne <salah.coronya@gmail.com>
-Date: Wed, 7 Feb 2024 14:55:38 -0600
-Subject: [PATCH] configure: Change mistaken += to =
-
-Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 771004b..0f1457e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -540,7 +540,7 @@ and submitting patches upstream!])
- # Rather than nesting these and making them ugly just use a counter.
- AX_CHECK_COMPILE_FLAG([-fdata-sections], [strip=y])
- AX_CHECK_COMPILE_FLAG([-ffunction-sections], [strip="y$strip"])
--AX_CHECK_LINK_FLAG([[-Wl,--gc-sections]], [strip+="y$strip"])
-+AX_CHECK_LINK_FLAG([[-Wl,--gc-sections]], [strip="y$strip"])
-
- AS_IF([test x"$strip" = xyyy], [
- EXTRA_CFLAGS="$EXTRA_CFLAGS -fdata-sections -ffunction-sections"
---
-2.43.0
-
diff --git a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.9.1-Fix-prefix-install-variable.patch b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.9.1-Fix-prefix-install-variable.patch
new file mode 100644
index 000000000000..e698ceb12806
--- /dev/null
+++ b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.9.1-Fix-prefix-install-variable.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 1ec6eb4..9e47feb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -487,7 +487,7 @@ AM_CONDITIONAL([HAVE_P11KIT], [test "x$have_p11kit" = "xyes"])
+
+ # check for --prefix and set flag HAVE_PREFIX if found
+ # do not change install location if --prefix is given and with P11_KIT found
+-AM_CONDITIONAL([HAVE_PREFIX], [test ! -z "$(prefix)"])
++AM_CONDITIONAL([HAVE_PREFIX], [test ! -z "${prefix}"])
+
+ # END P11 CONFIG
+