CVS commit: pkgsrc/mk/compiler

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/mk/compiler
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sun, 18 Jan 2026 21:08:07 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan 18 21:08:07 UTC 2026

Modified Files:
        pkgsrc/mk/compiler: ccache.mk ccc.mk clang.mk gcc.mk hp.mk icc.mk
            mipspro.mk pcc.mk sunpro.mk xlc.mk

Log Message:
mk: remove unused CC_VERSION_STRING

Only effective change is in ccache, which now uses CC_VERSION instead.

ccache sanity check by gdt@, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/mk/compiler/ccache.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/mk/compiler/ccc.mk
cvs rdiff -u -r1.46 -r1.47 pkgsrc/mk/compiler/clang.mk
cvs rdiff -u -r1.306 -r1.307 pkgsrc/mk/compiler/gcc.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mk/compiler/hp.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mk/compiler/icc.mk
cvs rdiff -u -r1.42 -r1.43 pkgsrc/mk/compiler/mipspro.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mk/compiler/pcc.mk
cvs rdiff -u -r1.50 -r1.51 pkgsrc/mk/compiler/sunpro.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mk/compiler/xlc.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/ccache.mk
diff -u pkgsrc/mk/compiler/ccache.mk:1.44 pkgsrc/mk/compiler/ccache.mk:1.45
--- pkgsrc/mk/compiler/ccache.mk:1.44   Mon May 13 00:43:46 2024
+++ pkgsrc/mk/compiler/ccache.mk        Sun Jan 18 21:08:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: ccache.mk,v 1.44 2024/05/13 00:43:46 gdt Exp $
+# $NetBSD: ccache.mk,v 1.45 2026/01/18 21:08:07 wiz Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -155,7 +155,7 @@ TOOL_DEPENDS+=      ccache-[0-9]*:../../devel
 # Override the compiler-specific hash with the version string for the
 # compiler.
 #
-PKGSRC_MAKE_ENV+=      CCACHE_COMPILERCHECK=echo\ ${CC_VERSION_STRING:Q}
+PKGSRC_MAKE_ENV+=      CCACHE_COMPILERCHECK=echo\ ${CC_VERSION:Q}
 PKGSRC_MAKE_ENV+=      CCACHE_DIR=${CCACHE_DIR:Q}
 PKGSRC_MAKE_ENV+=      CCACHE_PATH=${CCPATH:H}:${CXXPATH:H}:${CPPPATH:H}
 .ifdef CCACHE_LOGFILE

Index: pkgsrc/mk/compiler/ccc.mk
diff -u pkgsrc/mk/compiler/ccc.mk:1.20 pkgsrc/mk/compiler/ccc.mk:1.21
--- pkgsrc/mk/compiler/ccc.mk:1.20      Sat Apr 20 16:32:42 2019
+++ pkgsrc/mk/compiler/ccc.mk   Sun Jan 18 21:08:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: ccc.mk,v 1.20 2019/04/20 16:32:42 rillig Exp $
+# $NetBSD: ccc.mk,v 1.21 2026/01/18 21:08:07 wiz Exp $
 #
 # This is the compiler definition for the Compaq C Compilers.
 #
@@ -33,11 +33,9 @@ PKG_CXX:=            ${_CCC_CXX}
 .endif
 _COMPILER_STRIP_VARS+= ${_CCC_VARS}
 
-.if exists(${CCPATH}) && !defined(CC_VERSION_STRING)
-CC_VERSION_STRING!=    ${CCPATH} -V 2>&1 | ${AWK} '{print; exit(0);}'
+.if exists(${CCPATH})
 CC_VERSION!=           ${CCPATH} -V 2>&1 | ${AWK} '{print "CCC-"$$3; exit(0);}'
 .else
-CC_VERSION_STRING?=    ${CC_VERSION}
 CC_VERSION?=           CCC
 .endif
 

Index: pkgsrc/mk/compiler/clang.mk
diff -u pkgsrc/mk/compiler/clang.mk:1.46 pkgsrc/mk/compiler/clang.mk:1.47
--- pkgsrc/mk/compiler/clang.mk:1.46    Wed Apr  9 11:53:18 2025
+++ pkgsrc/mk/compiler/clang.mk Sun Jan 18 21:08:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: clang.mk,v 1.46 2025/04/09 11:53:18 adam Exp $
+# $NetBSD: clang.mk,v 1.47 2026/01/18 21:08:07 wiz Exp $
 #
 # This is the compiler definition for the clang compiler.
 #
@@ -48,11 +48,6 @@ CLANG_VERSION=               0
 CC_VERSION=            clang-${CLANG_VERSION}
 .endif
 
-#
-# TODO: CC_VERSION_STRING is obsolete and should be removed at some point.
-#
-CC_VERSION_STRING=     ${CC_VERSION}
-
 _COMPILER_ABI_FLAG.32= -m32
 _COMPILER_ABI_FLAG.64= -m64
 

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.306 pkgsrc/mk/compiler/gcc.mk:1.307
--- pkgsrc/mk/compiler/gcc.mk:1.306     Fri Jan 16 05:59:24 2026
+++ pkgsrc/mk/compiler/gcc.mk   Sun Jan 18 21:08:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.306 2026/01/16 05:59:24 wiz Exp $
+# $NetBSD: gcc.mk,v 1.307 2026/01/18 21:08:07 wiz Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -48,10 +48,6 @@
 # CC_VERSION
 #      A string of the form "gcc-4.3.2"
 #
-# CC_VERSION_STRING
-#      The same(?) as CC_VERSION. FIXME: What's the difference between
-#      the two?
-#
 # Keywords: gcc
 #
 
@@ -68,7 +64,7 @@ _USER_VARS.gcc=       \
 _PKG_VARS.gcc= \
        GCC_REQD USE_GCC_RUNTIME USE_LANGUAGES
 _SYS_VARS.gcc= \
-       CC_VERSION CC_VERSION_STRING LANGUAGES.gcc \
+       CC_VERSION LANGUAGES.gcc \
        CCPATH CPPPATH CXXPATH F77PATH FCPATH \
        PKG_CC PKG_CPP PKG_CXX PKG_FC FC PKGSRC_FORTRAN \
        GNATMAKE ADAPATH GMKPATH GLKPATH GBDPATH CHPPATH GLSPATH GNTPATH PRPPATH \
@@ -1257,7 +1253,6 @@ _COMPILER_ABI_FLAG.64=    -m64
 
 .if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS])
 .  if exists(${CCPATH})
-CC_VERSION_STRING!=    ${CCPATH} -v 2>&1
 CC_VERSION!=           \
        if ${CCPATH} -dumpversion > /dev/null 2>&1; then                \
                ${ECHO} "gcc-`${CCPATH} -dumpversion`";                 \
@@ -1266,11 +1261,9 @@ CC_VERSION!=             \
        fi
 
 .  else
-CC_VERSION_STRING=     ${CC_VERSION}
 CC_VERSION=            gcc-${_GCC_REQD}
 .  endif
 .else
-CC_VERSION_STRING=     ${CC_VERSION}
 CC_VERSION=            ${_GCC_PKG}
 .endif
 

Index: pkgsrc/mk/compiler/hp.mk
diff -u pkgsrc/mk/compiler/hp.mk:1.7 pkgsrc/mk/compiler/hp.mk:1.8
--- pkgsrc/mk/compiler/hp.mk:1.7        Tue Jun  2 22:32:49 2009
+++ pkgsrc/mk/compiler/hp.mk    Sun Jan 18 21:08:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: hp.mk,v 1.7 2009/06/02 22:32:49 joerg Exp $
+# $NetBSD: hp.mk,v 1.8 2026/01/18 21:08:07 wiz Exp $
 #
 # This is the compiler definition for the HP-UX C/aC++ compilers.
 #
@@ -33,11 +33,10 @@ PKG_CXX:=           ${_HP_CXX}
 .endif
 _COMPILER_STRIP_VARS+= ${_HP_VARS}
 
-.if exists(${CXXPATH}) && !defined(CC_VERSION_STRING)
-CC_VERSION_STRING!=    ${CXXPATH} -V 2>&1
-CC_VERSION=            ${CC_VERSION_STRING:S/ /_/Wg}
+.if exists(${CXXPATH})
+_CC_VERSION!=          ${CXXPATH} -V 2>&1
+CC_VERSION=            ${_CC_VERSION:S/ /_/Wg}
 .else
-CC_VERSION_STRING?=    ${CC_VERSION}
 CC_VERSION?=           hp
 .endif
 

Index: pkgsrc/mk/compiler/icc.mk
diff -u pkgsrc/mk/compiler/icc.mk:1.8 pkgsrc/mk/compiler/icc.mk:1.9
--- pkgsrc/mk/compiler/icc.mk:1.8       Thu May 19 22:37:55 2011
+++ pkgsrc/mk/compiler/icc.mk   Sun Jan 18 21:08:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: icc.mk,v 1.8 2011/05/19 22:37:55 alnsn Exp $
+# $NetBSD: icc.mk,v 1.9 2026/01/18 21:08:07 wiz Exp $
 #
 # This is the compiler definition for the Intel compilers.
 #
@@ -53,11 +53,9 @@ _LINKER_RPATH_FLAG=  -Wl,-R
 _COMPILER_RPATH_FLAG=  -Wl,-R
 
 .if exists(${CCPATH})
-CC_VERSION_STRING!=    ${CCPATH} -V 2>&1 | ${GREP} '^Intel'
 _CC_VERSION!=          ${CCPATH} -v 2>&1 || ${TRUE}
 CC_VERSION=            Intel C++ Compiler ${_CC_VERSION}
 .else
-CC_VERSION_STRING?=    ${CC_VERSION}
 CC_VERSION?=           Intel C++ Compiler
 .endif
 

Index: pkgsrc/mk/compiler/mipspro.mk
diff -u pkgsrc/mk/compiler/mipspro.mk:1.42 pkgsrc/mk/compiler/mipspro.mk:1.43
--- pkgsrc/mk/compiler/mipspro.mk:1.42  Mon Aug 22 09:18:29 2011
+++ pkgsrc/mk/compiler/mipspro.mk       Sun Jan 18 21:08:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: mipspro.mk,v 1.42 2011/08/22 09:18:29 cheusov Exp $
+# $NetBSD: mipspro.mk,v 1.43 2026/01/18 21:08:07 wiz Exp $
 #
 # This is the compiler definition for the MIPSpro C compiler.
 #
@@ -44,10 +44,8 @@ _COMPILER_STRIP_VARS+=       ${_MIPSPRO_VARS}
 
 .if exists(${CCPATH})
 # MIPSpro Compilers: Version 7.3.1.2m
-CC_VERSION_STRING!=    ${CCPATH} -version 2>&1 || ${TRUE}
 CC_VERSION!=           ${CCPATH} -version 2>&1 | ${GREP} '^MIPSpro'
 .else
-CC_VERSION_STRING?=    ${CC_VERSION}
 CC_VERSION?=           MIPSpro Compilers
 .endif
 

Index: pkgsrc/mk/compiler/pcc.mk
diff -u pkgsrc/mk/compiler/pcc.mk:1.10 pkgsrc/mk/compiler/pcc.mk:1.11
--- pkgsrc/mk/compiler/pcc.mk:1.10      Tue Dec 12 16:41:49 2023
+++ pkgsrc/mk/compiler/pcc.mk   Sun Jan 18 21:08:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: pcc.mk,v 1.10 2023/12/12 16:41:49 gdt Exp $
+# $NetBSD: pcc.mk,v 1.11 2026/01/18 21:08:07 wiz Exp $
 #
 # This is the compiler definition for the PCC compiler.
 #
@@ -59,10 +59,8 @@ _LINKER_RPATH_FLAG=  -R
 _COMPILER_RPATH_FLAG=  -Wl,-R
 
 .if exists(${CCPATH})
-CC_VERSION_STRING!=    ${CCPATH} -v 2>&1 || ${TRUE}
 CC_VERSION!=           ${CCPATH} -v 2>&1 | ${GREP} -E '^(pcc|Portable C Compiler)'
 .else
-CC_VERSION_STRING?=    ${CC_VERSION}
 CC_VERSION?=           pcc
 .endif
 

Index: pkgsrc/mk/compiler/sunpro.mk
diff -u pkgsrc/mk/compiler/sunpro.mk:1.50 pkgsrc/mk/compiler/sunpro.mk:1.51
--- pkgsrc/mk/compiler/sunpro.mk:1.50   Mon Nov 29 16:14:23 2021
+++ pkgsrc/mk/compiler/sunpro.mk        Sun Jan 18 21:08:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro.mk,v 1.50 2021/11/29 16:14:23 jperkin Exp $
+# $NetBSD: sunpro.mk,v 1.51 2026/01/18 21:08:07 wiz Exp $
 #
 # This is the compiler definition for the SUNWspro C compiler.
 #
@@ -81,10 +81,8 @@ _COMPILER_RPATH_FLAG=        -Wl,-R
 # XXX: What about the versions of the other compilers? Fortran and C++?
 # XXX: should be moved to compiler.mk.
 .if exists(${CCPATH})
-CC_VERSION_STRING!=    ${CCPATH} -V 2>&1 || ${TRUE}
 CC_VERSION!=           ${CCPATH} -V 2>&1 | ${GREP} '^cc'
 .else
-CC_VERSION_STRING?=    ${CC_VERSION}
 CC_VERSION?=           cc: Sun C
 .endif
 

Index: pkgsrc/mk/compiler/xlc.mk
diff -u pkgsrc/mk/compiler/xlc.mk:1.27 pkgsrc/mk/compiler/xlc.mk:1.28
--- pkgsrc/mk/compiler/xlc.mk:1.27      Wed Aug 22 20:48:37 2018
+++ pkgsrc/mk/compiler/xlc.mk   Sun Jan 18 21:08:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: xlc.mk,v 1.27 2018/08/22 20:48:37 maya Exp $
+# $NetBSD: xlc.mk,v 1.28 2026/01/18 21:08:07 wiz Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -99,10 +99,8 @@ _COMPILER_RPATH_FLAG=        -Wl,-R
 _LINKER_RPATH_FLAG=    -R
 
 .if exists(${CCPATH})
-CC_VERSION_STRING!=    ${CCPATH} -qversion 2>&1 | ${GREP} 'IBM XL C.*for' | ${SED} -e 's/^ *//' || ${TRUE}
-CC_VERSION=            ${CC_VERSION_STRING}
+CC_VERSION!=   ${CCPATH} -qversion 2>&1 | ${GREP} 'IBM XL C.*for' | ${SED} -e 's/^ *//' || ${TRUE}
 .else
-CC_VERSION_STRING?=    ${CC_VERSION}
 CC_VERSION?=           IBM XL C
 .endif

Prev by Date: CVS commit: pkgsrc/databases/db4
Next by Date: CVS commit: pkgsrc/misc/ocaml-opam
Previous by Thread: CVS commit: pkgsrc/databases/db4
Next by Thread: CVS commit: pkgsrc/misc/ocaml-opam
Indexes:

Home | Main Index | Thread Index | Old Index