From nobody Fri Nov 29 12:36:01 2024 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 4Y0CMj221Yz5f6jv; Fri, 29 Nov 2024 12:36:01 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y0CMj1SVJz4CXd; Fri, 29 Nov 2024 12:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732883761; 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=i2AspW3AV3AWdrmmZlw5FiqpTTd2P2COSsu1fScGiXI=; b=SY3P7LLCNjaIvA9on00XBPE6D/V/RrCXpGiLSzPvmf+lbfWWFLhqaazo0Sk6mGhH3oZ9lS G0h0FEoMvNh3Pw9l3bWqmUd7Egb9E2X5AVzReC/1nV52CgJxJ7maravzgq2gGjFpSlHo/I 6GVzwrcU4QzeEwcxSFNZWIJCtVebXERALBIQL1kb87pWOKZb4udZqGSskCZOij7RzNO6zO 1eKGaxUGl75RsfJLUp7zBNI5LnKnaBKMbFNSQmYJAiGhXYHxEMlhfMLt5U5ruLxF+Pedb2 HfcFXyAzwbH37yBRRos1joHCdGsYaIdXg9nf7chTsscbBY3Ve7kM9mJ3YhZUEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732883761; 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=i2AspW3AV3AWdrmmZlw5FiqpTTd2P2COSsu1fScGiXI=; b=rxBI3yaW2dYBIABQRRfac6rfKRJ91PS1V09KrbaZ7GRyjTuIdgCerLvYNA2Fs6Q8oesai4 vzf9AzKBb8BeDhameo2kZmLqZkdPQyYWSgykeFUwsvVGs39sFygJMBqjD9ORS+JbjB1Umx f1Fob+ZSGgDY2eFGFih9+T4cGbUTdLtZgQtSXqf0IYISa0qZ2kszTb0wrGhDMhdkVaTgX1 z9SsEltA5zAoBdtrmOmFP6TCQhizp1aBJkn6cx8LloEpU6AAKpprTJdP2ny/BYL9ldO9yw kJxR7Ol53NgIsoBxrAWZ7fZSSaTHGoc/gaKLiRwVyoWXN2m7vHKpxWM4UOTlEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732883761; a=rsa-sha256; cv=none; b=hYg9mDv+r7KnPJMeyPul94irumyKVZP8O3bXkarHot5LKtjb/usus9QnElk0z8h3NLc5A4 V5g7Zp2qQaoONKkMaJaV4V4y9FBN5bj3eDN27bruDb7T/IbGKKTy25gIJeMPM8t44KyfH0 UHN3JTL7AtLH97XBq4+uATSrc4Yg6ViWedfl7mjruhW7KggQAyWO0KdTsG//o+/ofs6TVw CUbhKVhIHW7qk/ulLBbZCY/k8+EhFXxEZYNPTSqXqmLIfcHbgSx64GvJxLOlLZO2LF7R5U nwwQh2jgnJPVt6Z/W+qgxl8u+gn7B976II1BavbOqZm2+SD94DTv1Tr3g5eCMQ== 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 4Y0CMj0zgtzNnF; Fri, 29 Nov 2024 12:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4ATCa1sk088206; Fri, 29 Nov 2024 12:36:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ATCa1j2088203; Fri, 29 Nov 2024 12:36:01 GMT (envelope-from git) Date: Fri, 29 Nov 2024 12:36:01 GMT Message-Id: <202411291236.4ATCa1j2088203@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 33718f6b048f - main - lang/gnat12: Fix build on aarch64 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33718f6b048fb4f37d4731783b3533c6331f6943 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=33718f6b048fb4f37d4731783b3533c6331f6943 commit 33718f6b048fb4f37d4731783b3533c6331f6943 Author: Jonathan Chen AuthorDate: 2024-11-29 12:34:30 +0000 Commit: Mikael Urankar CommitDate: 2024-11-29 12:35:52 +0000 lang/gnat12: Fix build on aarch64 PR: 279996 Approved by: thierry --- lang/gnat12/Makefile | 2 +- lang/gnat12/pkg-plist | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/gnat12/Makefile b/lang/gnat12/Makefile index ffe05d7a40d8..4d83bde70caf 100644 --- a/lang/gnat12/Makefile +++ b/lang/gnat12/Makefile @@ -115,7 +115,7 @@ _TOOLCHAIN_PATHS= /sbin:/bin:/usr/sbin:/usr/bin:${_GCC6AUX_PATH}:${PREFIX}/bin:$ .include -.if ${ARCH} == i386 || ${ARCH} == aarch64 +.if ${ARCH} == i386 LIB_DIR_32= "" PLIST_SUB+= 64BITS="@comment " .else diff --git a/lang/gnat12/pkg-plist b/lang/gnat12/pkg-plist index 341689854819..5c737c909468 100644 --- a/lang/gnat12/pkg-plist +++ b/lang/gnat12/pkg-plist @@ -5888,16 +5888,16 @@ gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/freebsd-spec.h gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/freebsd-stdint.h gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/freebsd.h %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/att.h -%%64BITS%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/biarch64.h +%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/biarch64.h %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/freebsd.h -%%64BITS%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/freebsd64.h +%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/freebsd64.h %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/i386-isa.def %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/i386-opts.h %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/i386-protos.h %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/i386.h %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/stringop.def %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/unix.h -%%64BITS%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/x86-64.h +%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/x86-64.h %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/x86-tune.def gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/initfini-array.h %%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/vxworks-dummy.h