| 1 |
commit: 846d47e8c5426578048aa6e41354d5e20c984fdb |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 9 20:11:19 2019 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 9 20:12:20 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=846d47e8 |
| 7 |
|
| 8 |
app-crypt/tpm2-tss: add missing sys-devel/autoconf-archive dependency |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=675016 |
| 11 |
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 13 |
|
| 14 |
.../tpm2-tss/files/tpm2-tss-2.1.0-build.patch | 39 ++++++++++++++++++++++ |
| 15 |
app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild | 3 +- |
| 16 |
2 files changed, 41 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch |
| 19 |
index 930c173239e..85f84c38e1f 100644 |
| 20 |
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch |
| 21 |
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch |
| 22 |
@@ -47,3 +47,42 @@ index c42b487f..f9118642 100644 |
| 23 |
dnl --------- Physical TPM device ----------------------- |
| 24 |
|
| 25 |
AC_ARG_WITH([ptpm], |
| 26 |
+From 74037d3c15b9f9d98f9b50ca4f1c1a99d239d751 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Philip Tricca <flihp@××××××.org> |
| 28 |
+Date: Sun, 4 Nov 2018 16:17:19 -0800 |
| 29 |
+Subject: [PATCH] build: Fix breakage in generated configure script when CFLAGS |
| 30 |
+ is set. |
| 31 |
+ |
| 32 |
+This fixes a bug introduced in 3980bad87fe18ad9d32914e9d21dba145eba973f. |
| 33 |
+That patch references the documentation for AC_PROG_CC but it misread |
| 34 |
+the recommended workaround. The leading colon (aka `:`) in the |
| 35 |
+documentation is significant. |
| 36 |
+ |
| 37 |
+The `:` is a shell 'builtin' command that is equivalent to invoking the |
| 38 |
+'true' command. By placing the conditional substitution of the CFLAGS |
| 39 |
+after this, the result of the substitution will be ignored and the |
| 40 |
+script won't fail. Without this the contents of the CFLAGS variable set |
| 41 |
+in the environment will be interpreted as a command and since they're |
| 42 |
+not commands the configure script will abort. |
| 43 |
+ |
| 44 |
+Signed-off-by: Philip Tricca <flihp@××××××.org> |
| 45 |
+--- |
| 46 |
+ configure.ac | 2 +- |
| 47 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 48 |
+ |
| 49 |
+diff --git a/configure.ac b/configure.ac |
| 50 |
+index c4e4592e..f88fe38b 100644 |
| 51 |
+--- a/configure.ac |
| 52 |
++++ b/configure.ac |
| 53 |
+@@ -31,7 +31,7 @@ AC_INIT([tpm2-tss], |
| 54 |
+ [], |
| 55 |
+ [https://github.com/tpm2-software/tpm2-tss]) |
| 56 |
+ AC_CONFIG_MACRO_DIR([m4]) |
| 57 |
+-${CFLAGS=""} |
| 58 |
++: ${CFLAGS=""} |
| 59 |
+ AC_PROG_CC |
| 60 |
+ LT_INIT() |
| 61 |
+ AM_INIT_AUTOMAKE([foreign |
| 62 |
+-- |
| 63 |
+2.19.2 |
| 64 |
+ |
| 65 |
|
| 66 |
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild |
| 67 |
index fc172e0e91c..e986cc524b4 100644 |
| 68 |
--- a/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild |
| 69 |
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild |
| 70 |
@@ -1,4 +1,4 @@ |
| 71 |
-# Copyright 1999-2018 Gentoo Authors |
| 72 |
+# Copyright 1999-2019 Gentoo Authors |
| 73 |
# Distributed under the terms of the GNU General Public License v2 |
| 74 |
|
| 75 |
EAPI=7 |
| 76 |
@@ -24,6 +24,7 @@ RDEPEND="gcrypt? ( dev-libs/libgcrypt:0= ) |
| 77 |
DEPEND="${DEPEND} |
| 78 |
test? ( dev-util/cmocka )" |
| 79 |
BDEPEND="virtual/pkgconfig |
| 80 |
+ sys-devel/autoconf-archive |
| 81 |
doc? ( app-doc/doxygen )" |
| 82 |
|
| 83 |
PATCHES=( |
Archives