diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2021-10-09 13:16:12 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2021-10-27 19:26:27 +0000 |
| commit | 78b01411ebc078d12fc4fa01db49d00f7e36a526 (patch) | |
| tree | 9b697a4fb5d6670684d817ace6c19a607f8e4f5e | |
| parent | 82a0987e8517e98e339ab648bc76fefefc517390 (diff) | |
security/sssd: Fix installation with automake 1.16.4
Patch the configure script so it evaluates a variable that uses
PYTHON_PREFIX (since automake 1.16.4) before PYTHON_PREFIX is unset.
PR: 258898
Approved by: maintainer timeout (2 weeks)
(cherry picked from commit b07a361a29711f26c51b24b433662baa37648194)
| -rw-r--r-- | security/sssd/files/patch-configure.ac | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/security/sssd/files/patch-configure.ac b/security/sssd/files/patch-configure.ac index 26284c2f63d5..4139f9c873e5 100644 --- a/security/sssd/files/patch-configure.ac +++ b/security/sssd/files/patch-configure.ac @@ -1,8 +1,6 @@ -diff --git configure.ac configure.ac -index 9df463d9c..17d0d9ea7 100644 ---- configure.ac +--- configure.ac.orig 2020-03-17 13:31:28 UTC +++ configure.ac -@@ -44,8 +44,6 @@ AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes]) +@@ -44,8 +44,6 @@ AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = y AC_CHECK_HEADERS(stdint.h dlfcn.h) AC_CONFIG_HEADER(config.h) @@ -11,3 +9,14 @@ index 9df463d9c..17d0d9ea7 100644 m4_include([src/build_macros.m4]) BUILD_WITH_SHARED_BUILD_DIR +@@ -356,8 +354,8 @@ them please use argument --without-python3-bindings wh + AM_CHECK_PYTHON_HEADERS([], + AC_MSG_ERROR([Could not find python3 headers])) + +- AC_SUBST([py3execdir], [$pyexecdir]) +- AC_SUBST([python3dir], [$pythondir]) ++ AC_SUBST([py3execdir], [$(eval echo $pyexecdir)]) ++ AC_SUBST([python3dir], [$(eval echo $pythondir)]) + AC_SUBST([PYTHON3_CFLAGS], [$PYTHON_CFLAGS]) + AC_SUBST([PYTHON3_LIBS], [$PYTHON_LIBS]) + AC_SUBST([PYTHON3_INCLUDES], [$PYTHON_INCLUDES]) |