CVS commit: pkgsrc/mk/compiler

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan 11 07:36:32 UTC 2026

Modified Files:
        pkgsrc/mk/compiler: gcc.mk

Log Message:
mk: remove broken logic that always included ${PKGSRC_FORTRAN}.mk

Just always include ${PKGSRC_FORTRAN}.mk for now, feel free to improve
this.


To generate a diff of this commit:
cvs rdiff -u -r1.299 -r1.300 pkgsrc/mk/compiler/gcc.mk

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

Modified files:

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.299 pkgsrc/mk/compiler/gcc.mk:1.300
--- pkgsrc/mk/compiler/gcc.mk:1.299     Sun Jan 11 07:25:41 2026
+++ pkgsrc/mk/compiler/gcc.mk   Sun Jan 11 07:36:32 2026
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.299 2026/01/11 07:25:41 wiz Exp $
+# $NetBSD: gcc.mk,v 1.300 2026/01/11 07:36:32 wiz Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -1383,19 +1383,7 @@ ${_GCC_${_var_}}:
 # On systems without a Fortran compiler, pull one in if needed.
 PKGSRC_FORTRAN?=gfortran
 
-_GCC_NEEDS_A_FORTRAN=  no
-.if empty(_USE_PKGSRC_GCC:M[yY][eE][sS]) && !(defined(FCPATH) && exists(${FCPATH}))
-_GCC_NEEDS_A_FORTRAN=  yes
-.else
-.  for _pattern_ in 0.* 1.[0-4] 1.[0-4].*
-.    if !empty(MACHINE_PLATFORM:MNetBSD-${_pattern_}-*)
-_GCC_NEEDS_A_FORTRAN=  yes
-.    endif
-.  endfor
-.endif
-.if !empty(_GCC_NEEDS_A_FORTRAN:M[yY][eE][sS])
-.  include "../../mk/compiler/${PKGSRC_FORTRAN}.mk"
-.endif
+.include "../../mk/compiler/${PKGSRC_FORTRAN}.mk"
 
 #.READONLY: GCC_REQD
 _GCC_REQD_EFFECTIVE:=  ${GCC_REQD}