From nobody Wed Oct 27 19:26:49 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7403A1810CC7; Wed, 27 Oct 2021 19:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hfdwn2qXtz3Pld; Wed, 27 Oct 2021 19:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 31EC91608B; Wed, 27 Oct 2021 19:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19RJQnth003750; Wed, 27 Oct 2021 19:26:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19RJQnLY003749; Wed, 27 Oct 2021 19:26:49 GMT (envelope-from git) Date: Wed, 27 Oct 2021 19:26:49 GMT Message-Id: <202110271926.19RJQnLY003749@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Tijl Coosemans Subject: git: 78b01411ebc0 - 2021Q4 - security/sssd: Fix installation with automake 1.16.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 78b01411ebc078d12fc4fa01db49d00f7e36a526 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=78b01411ebc078d12fc4fa01db49d00f7e36a526 commit 78b01411ebc078d12fc4fa01db49d00f7e36a526 Author: Tijl Coosemans AuthorDate: 2021-10-09 13:16:12 +0000 Commit: Tijl Coosemans CommitDate: 2021-10-27 19:26:27 +0000 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) --- security/sssd/files/patch-configure.ac | 17 +++++++++++++---- 1 file 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])