sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-15 17:50:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mk/bsd.gcc.mk: Remove support for USE_GCC=X+

Browse source 
At this point most ports that employ USE_GCC have the USE_GCC=yes
form, some have USE_GCC=X (where X is an older version of GCC than
the current default), and none is left with USE_GCC=X+.

To reduce complexity and since we are actively tracking upstream GCC
with our default version, remove support for the USE_GCC=X+ form.

This also derisks Mk/Uses/fortran.mk which aligns with USE_GCC after
commit 4191c71fbd. [1]

PR:		266196 [1]
This commit is contained in:
Gerald Pfeifer 2023-01-09 00:32:48 +00:00
parent b3bf2cc171
commit 9b5f5ab848
1 changed files with 5 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Mk/bsd.gcc.mk
View file

@ -8,10 +8,8 @@
# your port/system configuration. This is the preferred use of USE_GCC. # your port/system configuration. This is the preferred use of USE_GCC.
# It uses the canonical version of GCC defined in bsd.default-versions.mk. # It uses the canonical version of GCC defined in bsd.default-versions.mk.
# #
# If your port needs a specific (minimum) version of GCC, you can easily # If your port needs a specific version of GCC, you can instead specify
# specify that with a USE_GCC= statement. Unless absolutely necessary # that using USE_GCC=X (where X is the version of GCC).
# do so by specifying USE_GCC=X+ which requests at least GCC version X.
# To request a specific version omit the trailing + sign.
# #
# Optionally comma-separated arguments follow the version specifier. # Optionally comma-separated arguments follow the version specifier.
# Currently we support: # Currently we support:
@ -24,13 +22,10 @@
# Examples: # Examples:
# USE_GCC= yes # port requires a current version of GCC # USE_GCC= yes # port requires a current version of GCC
# # as defined in bsd.default-versions.mk. # # as defined in bsd.default-versions.mk.
# USE_GCC= 11+ # port requires GCC 11 or later. # USE_GCC= 11 # port requires GCC 11.
# USE_GCC= 9 # port requires GCC 9.
# USE_GCC= yes:build # port requires a current version of GCC at # USE_GCC= yes:build # port requires a current version of GCC at
# # build time only. # # build time only.
# USE_GCC= 10:build # port requires GCC 10 at build time only. # USE_GCC= 10:build # port requires GCC 10 at build time only.
# USE_GCC= 11+:build # port requires GCC 11 or later at build
# # time only.
# #
# If you are wondering what your port exactly does, use "make test-gcc" # If you are wondering what your port exactly does, use "make test-gcc"
# to see some debugging. # to see some debugging.
@ -66,14 +61,10 @@ IGNORE= bad target specification in USE_GCC; only "build" is supported
# Handle USE_GCC=yes. # Handle USE_GCC=yes.
. if ${USE_GCC} == yes . if ${USE_GCC} == yes
USE_GCC= ${GCC_DEFAULT}+ USE_GCC= ${GCC_DEFAULT}
. endif . endif
# See if we can use a later version or exclusively the one specified. _USE_GCC:= ${USE_GCC}
_USE_GCC:= ${USE_GCC:S/+//}
. if ${USE_GCC} != ${_USE_GCC}
_GCC_ORLATER:= true
. endif
# See whether we have the specific version requested installed already # See whether we have the specific version requested installed already
# and save that into _GCC_FOUND. In parallel, check if USE_GCC refers # and save that into _GCC_FOUND. In parallel, check if USE_GCC refers
@ -91,14 +82,6 @@ _GCC_FOUND:= ${_USE_GCC}
IGNORE= Unknown version of GCC specified (USE_GCC=${USE_GCC}) IGNORE= Unknown version of GCC specified (USE_GCC=${USE_GCC})
. endif . endif
# If the GCC package defined in USE_GCC does not exist, but a later
# version is allowed (for example 8+), go and use the default.
. if defined(_GCC_ORLATER)
. if !defined(_GCC_FOUND) && ${_USE_GCC} < ${GCC_DEFAULT}
_USE_GCC:= ${GCC_DEFAULT}
. endif
. endif # defined(_GCC_ORLATER)
# A concrete version has been selected. Set proper ports dependencies, # A concrete version has been selected. Set proper ports dependencies,
# CC, CXX, CPP, and flags. # CC, CXX, CPP, and flags.
V:= ${_USE_GCC:S/.//} V:= ${_USE_GCC:S/.//}
@ -146,11 +129,6 @@ test-gcc:
@echo "IGNORE: ${IGNORE}" @echo "IGNORE: ${IGNORE}"
.else .else
. if defined(USE_GCC) . if defined(USE_GCC)
. if defined(_GCC_ORLATER)
@echo Port can use later versions.
. else
@echo Port cannot use later versions.
. endif
@echo Using GCC version ${_USE_GCC} @echo Using GCC version ${_USE_GCC}
. endif . endif
@echo CC=${CC} - CXX=${CXX} - CPP=${CPP} @echo CC=${CC} - CXX=${CXX} - CPP=${CPP}