diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-04-16 13:07:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-04-16 13:07:24 +0100 |
| commit | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (patch) | |
| tree | 464c922e949c7e4d5d891fb2cdda5daee5612537 /app-crypt/swtpm/files | |
| parent | e68d405c5d712af4387159df07e226217bdda049 (diff) | |
gentoo resync : 16.04.2022
Diffstat (limited to 'app-crypt/swtpm/files')
| -rw-r--r-- | app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch | 26 | ||||
| -rw-r--r-- | app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch | 42 |
2 files changed, 42 insertions, 26 deletions
diff --git a/app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch b/app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch deleted file mode 100644 index 3880385256e3..000000000000 --- a/app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index d035653..0728a2e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -325,21 +325,11 @@ fi - AM_CONDITIONAL([WITH_GNUTLS], [test "x$with_gnutls" = "xyes"]) - AC_SUBST([GNUTLS_LIBS]) - --AC_PATH_PROG([EXPECT], expect) --if test "x$EXPECT" = "x"; then -- AC_MSG_ERROR([expect is required: expect package]) --fi -- - AC_PATH_PROG([GAWK], gawk) - if test "x$GAWK" = "x"; then - AC_MSG_ERROR([gawk is required: gawk package]) - fi - --AC_PATH_PROG([SOCAT], socat) --if test "x$SOCAT" = "x"; then -- AC_MSG_ERROR([socat is required: socat package]) --fi -- - AC_PATH_PROG([BASE64], base64) - if test "x$BASE64" = "x"; then - AC_MSG_ERROR([base64 is required: base64 package]) diff --git a/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch b/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch new file mode 100644 index 000000000000..b17e1c2470fc --- /dev/null +++ b/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch @@ -0,0 +1,42 @@ +configure.ac: Conditionalize test dependencies + +Signed-off-by: Christopher Byrne <salah.coronya@gmail.com> +--- a/configure.ac ++++ b/configure.ac +@@ -369,20 +369,25 @@ else + fi + AC_SUBST([DEFAULT_PCR_BANKS]) + +-AC_PATH_PROG([EXPECT], expect) +-if test "x$EXPECT" = "x"; then +- AC_MSG_ERROR([expect is required: expect package]) +-fi ++AC_ARG_ENABLE([test], ++ [AS_HELP_STRING([--enable-test], ++ [enable tests (default is yes)])], ++ [enable_test=$enableval], ++ [enable_test=yes]) ++ ++AS_IF([test "x$enable_test" != xno], ++ [AC_PATH_PROG([EXPECT], expect) ++ AS_IF([test "x$EXPECT" = "x"], ++ AC_MSG_ERROR([expect is required: expect package])) ++ AC_PATH_PROG([SOCAT], socat) ++ AS_IF([test "x$SOCAT" = "x"], ++ AC_MSG_ERROR([socat is required: socat package]))]) + + AC_PATH_PROG([GAWK], gawk) + if test "x$GAWK" = "x"; then + AC_MSG_ERROR([gawk is required: gawk package]) + fi + +-AC_PATH_PROG([SOCAT], socat) +-if test "x$SOCAT" = "x"; then +- AC_MSG_ERROR([socat is required: socat package]) +-fi + + AC_PATH_PROG([BASE64], base64) + if test "x$BASE64" = "x"; then +-- +2.34.1 + |