lang/gcc14-gnat: gcc.mk fixes

[Dmytro Kazankov (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dmytro Kazankov <dmytro.kazankov%gmail.com@localhost>
Pushed By:	dkazankov
Date:		Tue Nov 26 15:45:26 2024 +0200
Changeset:	025d5cb51a1c277181e0f84792e7b00f76a7f0a9

Modified Files:
	gcc14-gnat/gcc.mk

Log Message:
lang/gcc14-gnat: gcc.mk fixes

* gcc/gnat selection fixed
* Updates from latest pkgsrc's gcc.mk included

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=025d5cb51a1c277181e0f84792e7b00f76a7f0a9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gcc14-gnat/gcc.mk | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diffs:
diff --git a/gcc14-gnat/gcc.mk b/gcc14-gnat/gcc.mk
index af86e37378..e7c23170ce 100644
--- a/gcc14-gnat/gcc.mk
+++ b/gcc14-gnat/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.282 2024/06/29 13:08:09 wiz Exp $
+# $NetBSD: gcc.mk,v 1.284 2024/10/16 20:16:25 nia Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -230,12 +230,8 @@ GCC_REQD+=	4.9
 .endif
 
 .if !empty(USE_CC_FEATURES:Mc17)
-# \todo Find gcc documentation about c17 support.
-# gcc7 fails with --std=c17
-# gcc8, gcc9 are unknown
-# gcc10 works
-
-# Choose 10 following the limited versions guidance.
+# GCC 8 is the first version that works.  10 is the first version
+# shipped with a NetBSD release.
 GCC_REQD+=	10.0
 .endif
 
@@ -381,6 +377,8 @@ _GCC_PKG=	gcc-${_GCC_VERSION:C/-.*$//}
 # Note that pkgsrc also sets this flag itself for Darwin+clang.
 BUILDLINK_TRANSFORM+=	rm:-Wno-error=implicit-function-declaration
 BUILDLINK_TRANSFORM+=	rm:-Wno-error=sign-conversion
+BUILDLINK_TRANSFORM+=	rm:-Wno-error=incompatible-pointer-types
+BUILDLINK_TRANSFORM+=	rm:-Wno-error=implicit-int
 .endif
 
 .if !empty(_GCC_VERSION:M[23].*) || !empty(_GCC_VERSION:M4.[01234].*)
@@ -612,7 +610,7 @@ _NEED_GCC13=	yes
 _NEED_GCC14=	yes
 .endif
 
-# We've got fixed set of Ada compilers and languages them provided. So we try to find best possible variant
+# We have fixed set of Ada compilers and languages them provided. So we try to find best possible variant
 _NEED_GCC6_AUX?=no
 _NEED_GCC10_AUX?=no
 _NEED_GCC13_GNAT?=no
@@ -638,18 +636,6 @@ _NEED_GCC14_GNAT=no
 PKG_FAIL_REASON+=	"Package requires fortran compiler"
 .     endif
 .  endif
-.  if ${_NEED_GCC6_AUX:tl} == "yes" && ${_NEED_GCC6:tl} != "yes"
-_NEED_GCC6_AUX=no
-.  endif
-.  if ${_NEED_GCC10_AUX:tl} == "yes" && ${_NEED_GCC10:tl} != "yes"
-_NEED_GCC10_AUX=no
-.  endif
-.  if ${_NEED_GCC13_GNAT:tl} == "yes" && ${_NEED_GCC13:tl} != "yes"
-_NEED_GCC13_GNAT=no
-.  endif
-.  if ${_NEED_GCC14_GNAT:tl} == "yes" && ${_NEED_GCC14:tl} != "yes"
-_NEED_GCC14_GNAT=no
-.  endif
 .  if !empty(USE_LANGUAGES:Mobjc)
 _NEED_GCC6_AUX=no
 _NEED_GCC10_AUX=no
@@ -689,8 +675,8 @@ _NEED_GCC14=no
 .  if ${_NEED_GCC14_GNAT:tl} == "yes"
 _NEED_GCC6_AUX=no
 _NEED_GCC10_AUX=no
-_NEED_GCC13_AUX=no
-.  if ${_NEED_GCC13_GNAT:tl} == "yes"
+_NEED_GCC13_GNAT=no
+.  elif ${_NEED_GCC13_GNAT:tl} == "yes"
 _NEED_GCC6_AUX=no
 _NEED_GCC10_AUX=no
 .  elif ${_NEED_GCC10_AUX:tl} == "yes"
@@ -989,8 +975,8 @@ _IGNORE_GCC=		yes
 MAKEFLAGS+=		_IGNORE_GCC=yes
 .  endif
 .  if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc)
-_GCC_PKGSRCDIR=		../../lang/gcc14-gnat
-_GCC_DEPENDENCY=	gcc14-gnat>=${_GCC_REQD}:../../lang/gcc14-gnat
+_GCC_PKGSRCDIR=		../../wip/gcc14-gnat
+_GCC_DEPENDENCY=	gcc14-gnat>=${_GCC_REQD}:../../wip/gcc14-gnat
 _USE_GCC_SHLIB?=	no
 .  endif
 .endif