From owner-dev-commits-ports-all@freebsd.org Wed Jun 23 16:38:11 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D8A1965327F; Wed, 23 Jun 2021 16:38:11 +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 4G988M5lryz3HKB; Wed, 23 Jun 2021 16:38:11 +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 ADB5227AB4; Wed, 23 Jun 2021 16:38:11 +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 15NGcBPB074306; Wed, 23 Jun 2021 16:38:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15NGcB3L074305; Wed, 23 Jun 2021 16:38:11 GMT (envelope-from git) Date: Wed, 23 Jun 2021 16:38:11 GMT Message-Id: <202106231638.15NGcB3L074305@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: 1b9b7e36375f - main - math/maxima: Fix staging error MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b9b7e36375f51b5b1cfc50c46694885f1c63f47 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2021 16:38:11 -0000 The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b9b7e36375f51b5b1cfc50c46694885f1c63f47 commit 1b9b7e36375f51b5b1cfc50c46694885f1c63f47 Author: Fernando Apesteguía AuthorDate: 2021-06-23 06:38:17 +0000 Commit: Fernando Apesteguía CommitDate: 2021-06-23 16:32:56 +0000 math/maxima: Fix staging error configure.ac uses the git command if present to populate the VERSION variable. As a consecuence, this produces a dynamically changing installation directory in STAGEDIR that breaks the build in some conditions. Note that on a clean environment (poudriere), this works fine. This patch comments that portion of configure.ac out since it is of no use inside the ports tree. PR: 255683 Reported by: russo@bogodyn.org --- math/maxima/files/patch-configure.ac | 39 ++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/math/maxima/files/patch-configure.ac b/math/maxima/files/patch-configure.ac new file mode 100644 index 000000000000..2d42071d5c66 --- /dev/null +++ b/math/maxima/files/patch-configure.ac @@ -0,0 +1,39 @@ +--- configure.ac.orig 2021-06-22 16:59:07.387685000 -0600 ++++ configure.ac 2021-06-22 16:59:40.892936000 -0600 +@@ -165,21 +165,21 @@ + + + dnl See if git exists. If it does, update VERSION to include a git tag +-AC_CHECK_PROG(git_found, git, true, false) +-if test x"${git_found}" = xtrue; then +- # Test to see if git describe works (discarding any output). If +- # it works, use it. Otherwise, keep existing value of VERSION. +- # (git describe fails if git is executed in a non-Git directory, e.g., +- # an unpacked tarball. Since the exit codes of git describe are undocumented, +- # we cannot distinguish that from a missing annotated tag. +- # Play it safe by refusing to change VERSION.) +- if git describe > /dev/null 2>&1; then +- VERSION="`git describe --dirty`" +- # When building RPMs, hyphens in the version are not allowed, so +- # replace them with underscores. +- VERSION=`echo $VERSION | sed 's;-;_;g'` +- fi +-fi ++dnl AC_CHECK_PROG(git_found, git, true, false) ++dnl if test x"${git_found}" = xtrue; then ++dnl # Test to see if git describe works (discarding any output). If ++dnl # it works, use it. Otherwise, keep existing value of VERSION. ++dnl # (git describe fails if git is executed in a non-Git directory, e.g., ++dnl # an unpacked tarball. Since the exit codes of git describe are undocumented, ++dnl # we cannot distinguish that from a missing annotated tag. ++dnl # Play it safe by refusing to change VERSION.) ++dnl if git describe > /dev/null 2>&1; then ++dnl VERSION="`git describe --dirty`" ++dnl # When building RPMs, hyphens in the version are not allowed, so ++dnl # replace them with underscores. ++dnl VERSION=`echo $VERSION | sed 's;-;_;g'` ++dnl fi ++dnl fi + + dnl Parses the version number for the manual + manual_version=`echo $VERSION | sed 's+branch_++; s+_base++; s+_dirty++; s+_+.+g'`