From nobody Wed Dec 14 10:37:35 2022 X-Original-To: dev-commits-ports-main@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 4NXBdW4vDhz4kJ38; Wed, 14 Dec 2022 10:37:35 +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 4NXBdW3rqWz44xv; Wed, 14 Dec 2022 10:37:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671014255; 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=GnuvDxgpWDJKgxBD2Xt5UFXRgDraTG6FbnXcnLz6FdY=; b=JM8dxaAoeWf/HOMKM32qQO4lEUanVD4IcQecH6FiR/x/E5cswzIyGdz0GIiTw9nbDB6++h nJ1u9Wmx+i/3x1+lp4SjbAfZ/K7KlwcdR7UyCNQl52vO5V5O4DtE5yzlITzjf2UAU+SoHb jUrGrnOAJtSQKN0+9RVbhLEhi7AweDBVaZ6KpSRueuFJ9jAn+JIdSedYtiE8JhuKGJrbm4 tfn3jUgEJ+olIWVqS7IrlkR3aL83o15RwLgX5OYmHaMfcALYumEyPm48OPdI8ipKSN+rb2 2oKXNDylz4KKolzBVazs5Xn/O6enU4SxwWPhYfsPcsVo6PFjiz/TapJ8/024Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671014255; 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=GnuvDxgpWDJKgxBD2Xt5UFXRgDraTG6FbnXcnLz6FdY=; b=jiZnldSf7/SS+qDVksj7/NZpmN8hoLuyFLAEMypTu3wUv30STRDJNEuitutY02Y0LWX+LK 10C/N4lx2cLQAM5uIzAQucWJ+9GxixEa0QaI+jVq0FZFDQ8vcBWMjKMpd8q5CZeQIIpxMO XsWpQxaNVXfZEfcasrBJIGuHgTrn3R601vyQcBNCt/IWSdTbJrB+edTLGCoCuhHCt7HhMi Joej7KS58a7VC0otGlFhP+xniUbeQZGpnAby8eZsEq95lpqB/nsAQgCINgdFU2/qsmh6p1 yKFW4svcxSVpwDJvX+6d4hIfUuq9+vGQD050nRG4OYY0BoO52b3TWTE7f2Z8cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671014255; a=rsa-sha256; cv=none; b=qqwLhT16izjWyaFxEREwKSO9JQlVJ4qn0p1AFMH7CAAIb/JheIHvw0JidI6wzRal4hKYV6 O8zKL2HmhkKTGrVKD1jSlLknR7b2TBoSKydepTvviNyq8CpPmB5BcEvj4Fpo8oGQAmLJIg G2EpqWcOBc+5NURLuLdcjESA6qa1adZw0wtRULnYUwb+RPeLp5UHjq6/dG36w0/JyDjxRD IF+jqBKyn98AG6H8KCQ/DpEHcIRh7hucp7iMPTotZ/X98MFUqEgMyVbD8+6WrbRp8LUVDk I8Q9QM1UUi69VEcObTBnX6BVAoA3fOA9PMiGIze/odUBB0Db8uPTupQX6GRWbQ== 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 4NXBdW2xBGzr7k; Wed, 14 Dec 2022 10:37:35 +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 2BEAbZLg047054; Wed, 14 Dec 2022 10:37:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BEAbZQk047053; Wed, 14 Dec 2022 10:37:35 GMT (envelope-from git) Date: Wed, 14 Dec 2022 10:37:35 GMT Message-Id: <202212141037.2BEAbZQk047053@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: 3ebee3c508e5 - main - Mk/Uses/ada.mk: add support for gnat12 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 3ebee3c508e538ea878b0572af09b5f16b752cbc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ebee3c508e538ea878b0572af09b5f16b752cbc commit 3ebee3c508e538ea878b0572af09b5f16b752cbc Author: Thierry Thomas AuthorDate: 2022-12-14 10:17:27 +0000 Commit: Thierry Thomas CommitDate: 2022-12-14 10:37:17 +0000 Mk/Uses/ada.mk: add support for gnat12 Keep lang/gcc6-aux by default for the moment. --- Mk/Uses/ada.mk | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/Mk/Uses/ada.mk b/Mk/Uses/ada.mk index 0cb5d0ed3002..cadd45051c5e 100644 --- a/Mk/Uses/ada.mk +++ b/Mk/Uses/ada.mk @@ -2,24 +2,59 @@ # To change default compiler, define ADA_DEFAULT in make.conf # # Feature: ada -# Usage: USES=ada -# Valid ARGS: run +# Usage: USES=ada:ARGS +# Valid ARGS: [],[run] +# +# version The chooseable versions are 6 (default) or 12 +# +# run Add run depends # # MAINTAINER: ports@FreeBSD.org .if !defined(_INCLUDE_USES_ADA_MK) _INCLUDE_USES_ADA_MK= yes -CC= ada +_ADA_SUPPORTED= 6 12 + +_ada_version= # +. for _ver in ${_ADA_SUPPORTED:O:u} +. if ${ada_ARGS:M${_ver}} +. if empty(_ada_version) +_ada_version= ${_ver} +. else +IGNORE= Incorrect USES=ada:${ada_ARGS} - multiple versions defined +. endif +. endif +. endfor + +. if empty(_ada_version) +_ada_version= 6 # default, to be changed when gnat12 becomes self-supporting +. endif + +. if ${_ada_version} == 6 +_ADAPATH= ${LOCALBASE}/gcc6-aux/bin +_ADAPORT= lang/gcc6-aux +_BINDEP= ${_ADAPATH}/ada +CC= ada +. else +_ADAPATH= ${LOCALBASE}/gnat${_ada_version}/bin +_ADAPORT= lang/gnat${_ada_version} +_BINDEP= ${_ADAPATH}/gnat${_ada_version} +CC= gnatmake${_ada_version} -f -u +BINARY_ALIAS+= gcc=${_ADAPATH}/gcc12 \ + ada=${_ADAPATH}/gcc12 \ + gnatmake=${_ADAPATH}/gnatmake${_ada_version} \ + gnatbind=${_ADAPATH}/gnatbind${_ada_version} +. endif . if ${ada_ARGS:Mrun} -RUN_DEPENDS+= ${LOCALBASE}/gcc6-aux/bin/ada:lang/gcc6-aux +RUN_DEPENDS+= ${_BINDEP}:${_ADAPORT} . endif -BUILD_DEPENDS+= ${LOCALBASE}/gcc6-aux/bin/ada:lang/gcc6-aux -MAKE_ENV+= PATH=${LOCALBASE}/gcc6-aux/bin:${PATH} \ +BUILD_DEPENDS+= ${_BINDEP}:${_ADAPORT} +MAKE_ENV+= PATH=${_ADAPATH}:${PATH} \ ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat -CONFIGURE_ENV+= PATH=${LOCALBASE}/gcc6-aux/bin:${PATH} \ +CONFIGURE_ENV+= PATH=${_ADAPATH}:${PATH} \ ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat .endif