gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-16 14:29:05 -07:00
Code Issues Projects Releases Wiki Activity

app-crypt/swtpm: Fix conditional patching

Browse Source 
Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24797
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
Christopher Byrne
2022-03-28 22:22:43 -05:00
committed by Joonas Niilola
parent 423e0819a8
commit b239ccbe1e
3 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch
View File

@@ -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])

42
app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch Normal file
View File

@@ -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

5
app-crypt/swtpm/swtpm-0.7.2.ebuild
View File

@@ -44,10 +44,10 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
"${FILESDIR}/${PN}-0.7.2-Conditionalize-test-dependencies.patch"
)
src_prepare() {
use test || eapply "${FILESDIR}/${PN}-0.5.0-disable-test-dependencies.patch"
default
eautoreconf
}
@@ -58,7 +58,8 @@ src_configure() {
--without-selinux \
$(use_with fuse cuse) \
$(use_with gnutls) \
$(use_with seccomp)
$(use_with seccomp) \
$(use_enable test)
}
src_install() {