Date: Thu, 23 Nov 2023 18:01:46 GMT 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: 5d276ab3adc9 - main - lang/gnat12: fix ASSETS Message-ID: <202311231801.3ANI1kSD004811@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d276ab3adc94c58a827645f9c272e63fe482f92 commit 5d276ab3adc94c58a827645f9c272e63fe482f92 Author: Thierry Thomas <thierry@FreeBSD.org> AuthorDate: 2023-11-23 14:10:54 +0000 Commit: Thierry Thomas <thierry@FreeBSD.org> CommitDate: 2023-11-23 18:01:43 +0000 lang/gnat12: fix ASSETS --- lang/gnat12/Makefile | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/lang/gnat12/Makefile b/lang/gnat12/Makefile index 8cbeea1dfdbe..967629108a00 100644 --- a/lang/gnat12/Makefile +++ b/lang/gnat12/Makefile @@ -61,6 +61,9 @@ OPTIONS_DEFINE= ASSETS NLS OPTIONS_DEFINE_amd64+= MULTILIB OPTIONS_DEFINE_powerpc64+= MULTILIB .endif +OPTIONS_RADIO= BOOTSTRAP +OPTIONS_RADIO_BOOTSTRAP= GCC6AUX PREVASSET +OPTIONS_DEFAULT= GCC6AUX .if defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+= ASSETS .endif @@ -68,9 +71,6 @@ OPTIONS_DEFAULT+= ASSETS OPTIONS_DEFAULT_amd64+= MULTILIB #OPTIONS_DEFAULT_powerpc64+= MULTILIB # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105010 .endif -OPTIONS_RADIO= BOOTSTRAP -OPTIONS_RADIO_BOOTSTRAP= GCC6AUX PREVASSET -OPTIONS_DEFAULT= GCC6AUX OPTIONS_SUB= yes ASSETS_DESC= Build an asset for future bootstrap on the target platform @@ -111,20 +111,10 @@ _TOOLCHAIN_PATHS= /sbin:/bin:/usr/sbin:/usr/bin:${_GCC6AUX_PATH}:${PREFIX}/bin:$ .include <bsd.port.options.mk> -.if ${ARCH} == aarch64 -_PREV_ASSET_REV?= _5 -.elif ${ARCH} == i386 -. if ${OSREL:R} == 14 +.if ${ARCH} == aarch64 && ${OSREL:R} == 15 _PREV_ASSET_REV?= _5 -. else -_PREV_ASSET_REV?= _6 -. endif -.else # amd64 -. if ${OSREL:R} == 12 || ${OSREL:R} == 14 -_PREV_ASSET_REV?= _5 -. else +.else _PREV_ASSET_REV?= _6 -. endif .endif .if ${ARCH} == i386 || ${ARCH} == aarch64
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311231801.3ANI1kSD004811>