Date: Wed, 11 Feb 2026 16:51:47 +0000 From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ccc8f9ff513e - main - lang/gnat1.: fix fetching without previous asset Message-ID: <698cb3a3.27cfa.b492e1d@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=ccc8f9ff513eaf75305afafe7e7322286763f24c commit ccc8f9ff513eaf75305afafe7e7322286763f24c Author: Thierry Thomas <thierry@FreeBSD.org> AuthorDate: 2026-02-11 16:47:47 +0000 Commit: Thierry Thomas <thierry@FreeBSD.org> CommitDate: 2026-02-11 16:51:43 +0000 lang/gnat1.: fix fetching without previous asset MFC after: 8 days --- lang/gnat13/Makefile | 3 ++- lang/gnat14/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lang/gnat13/Makefile b/lang/gnat13/Makefile index cf8b1111116c..24e07b8e6887 100644 --- a/lang/gnat13/Makefile +++ b/lang/gnat13/Makefile @@ -65,7 +65,7 @@ OPTIONS_DEFINE_powerpc64+= MULTILIB .endif OPTIONS_RADIO= BOOTSTRAP OPTIONS_RADIO_BOOTSTRAP= GNAT12 PREVASSET -OPTIONS_DEFAULT= ${"${OSVERSION:M1600*}" == "" && "${ARCH:Maarch64*}" == "":?GNAT12:PREVASSET} +OPTIONS_DEFAULT= ${"${_OSVERARCH:M1600*aarch64}" != "":?GNAT12:PREVASSET} .if defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+= ASSETS .endif @@ -94,6 +94,7 @@ NLS_CONFIGURE_ON= --enable-nls NLS_CONFIGURE_OFF= --disable-nls PREVASSET_DISTFILES+= ${_PREV_ASSET_FILE}.tar.xz:gnat PREVASSET_VARS= _GNAT12_PATH=${WRKDIR}/${_PREV_ASSET_FILE}/bin +_OSVERARCH= ${OSVERSION}${ARCH} _ASSET_FILE= gnat-${_GNAT_ARCH}-${OPSYS:tl}.${OSREL:R}-${PKGVERSION} _GCC_VER= ${DISTVERSION:R:R} diff --git a/lang/gnat14/Makefile b/lang/gnat14/Makefile index 6f8b9a12eb2a..7fb7345bb172 100644 --- a/lang/gnat14/Makefile +++ b/lang/gnat14/Makefile @@ -65,7 +65,7 @@ OPTIONS_DEFINE_powerpc64+= MULTILIB .endif OPTIONS_RADIO= BOOTSTRAP OPTIONS_RADIO_BOOTSTRAP= GNAT13 PREVASSET -OPTIONS_DEFAULT= PREVASSET +OPTIONS_DEFAULT= ${"${_OSVERARCH:M1600*aarch64}" != "":?GNAT13:PREVASSET} .if defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+= ASSETS .endif @@ -94,6 +94,7 @@ NLS_CONFIGURE_ON= --enable-nls NLS_CONFIGURE_OFF= --disable-nls PREVASSET_DISTFILES+= ${_PREV_ASSET_FILE}.tar.xz:gnat PREVASSET_VARS= _GNAT13_PATH=${WRKDIR}/${_PREV_ASSET_FILE}/bin +_OSVERARCH= ${OSVERSION}${ARCH} _ASSET_FILE= gnat-${_GNAT_ARCH}-${OPSYS:tl}.${OSREL:R}-${PKGVERSION} _GCC_VER= ${DISTVERSION:R:R}home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?698cb3a3.27cfa.b492e1d>