From nobody Thu Nov 23 18:01:46 2023 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 4SbmCH0YzWz52Cp6; Thu, 23 Nov 2023 18:01:47 +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 4SbmCG4xQPz3L8h; Thu, 23 Nov 2023 18:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700762506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5iXtA+9mFK3kxI5PowuaxNuRk37jzieI9eAmA8Skbmk=; b=YIe94lKyIhPqzqPLz1N/tWI1RxUFjYnmhy6rCdVLKkCscVbOlbBuJoOnWMt4LQvTAcXBBo tzPzQZ97nbGCeb0lAhEAVYkrkSIx4IEgRMfZKH8gykuR8Fgg48X47hwRXN2/LI51hC//yS ROLtFurQcCdjbn5M3B4KU34qNp9DwgbWsXfVgO7V8plH1S3Ig+LCaJ4/eddSrLBX7T93QY qfnDHzE4xKFohWKQp/Xx/6k9rVmoryyajsfIeBs5xBo2CLrEFV4KW9ksG9rNxyTkzPvH1k cBLN2Dp6MYRRL/pWV3iKOGsdFfRLzP5AU3Ba8qsGkA/M+cbw0FrFY7AsTPFDIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700762506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5iXtA+9mFK3kxI5PowuaxNuRk37jzieI9eAmA8Skbmk=; b=sqd/EAgVtMCo/CwyI3qFmUTYSqdQmfRzhwbwVUhfnFIODzg1B3tE3mXk5FhH3Bn1+GCxLV DnFoej32evPAQ5uVtX9ACjpRykdMccQFOjyulVjHO6yjsNiacz0BOayKGdJtSQ7+lkhLEr DJWH+iPzq6kQlt+jO2mY8nle2DvduyqASRdBX9kLp3RDzBPi3SLgSHR1lEycot/UcdlL7r 77/ynIUluwhx44jbKX9nd6W6WeyVJRquU+AOG8yH2mCTkCI0R42Esixb+WwTW+lUG1wVPX Rq86zNXhk3Tv5QQoaM/PzgybB+J0ww/PsfhyOnL9jQa82F3LnAdE/fUtkbbX4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700762506; a=rsa-sha256; cv=none; b=XgfRoRp1jfrIMaf0s52+Xrcg9KwFCAVTW2KNhS92hbifFoGJLpHHK+O9f8I9Tyr6Ew+VNm 0Y4SShpmCzAfyG/eqmGgk9vC9yLthy7nr7N1h4wCErCH3L/h2Pa51Uyxpi7LQfiF1KqYfv JRDZJAX9D1PL5sOls7JPV9Xt9qMUJQn9+7ZFKIaG/WN9zlkTycPKlXzqeVUTnJ3D64FeoX vSqyWl+C/dDcDI1HYsLUMo1FWCQ8jxpZl49MPmuufgcUsAFLBnGGXOez0LxZXNyYVijiso Z4eAlN7ny0DUQAy0eIolhW/AJuCVxCzSMv24+C4hVZPfbYMbKb/7XucLVuYHcQ== 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 4SbmCG40PTz19wj; Thu, 23 Nov 2023 18:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ANI1kKs004814; Thu, 23 Nov 2023 18:01:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ANI1kSD004811; Thu, 23 Nov 2023 18:01:46 GMT (envelope-from git) Date: Thu, 23 Nov 2023 18:01:46 GMT Message-Id: <202311231801.3ANI1kSD004811@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 5d276ab3adc9 - main - lang/gnat12: fix ASSETS 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d276ab3adc94c58a827645f9c272e63fe482f92 Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d276ab3adc94c58a827645f9c272e63fe482f92 commit 5d276ab3adc94c58a827645f9c272e63fe482f92 Author: Thierry Thomas AuthorDate: 2023-11-23 14:10:54 +0000 Commit: Thierry Thomas 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 -.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