ok
On 2026/10/20 18:08, Kirill A. Korinsky wrote:
> On Tue, 20 Oct 2026 18:00:10 +0200,
> Stuart Henderson <[email protected]> wrote:
> >
> > On 2026/10/20 17:54, Kirill A. Korinsky wrote:
> > > On Tue, 20 Oct 2026 17:25:19 +0200,
> > > Stuart Henderson <[email protected]> wrote:
> > > >
> > > > On 2026/10/20 14:39, Kirill A. Korinsky wrote:
> > > > > ports@,
> > > > >
> > > > > I think GCC49_ARCHS is very misslead and using PORTSGCC_ARCHS instead
> > > > > makes sense.
> > > >
> > > > > @@ -40,10 +40,10 @@ LLD_ARCHS = aarch64 amd64 arm i386 power
> > > > > # as well as available for PROPERTIES checks.
> > > > > LLVM_ARCHS = aarch64 amd64 arm i386 mips64 mips64el powerpc
> > > > > powerpc64 riscv64 sparc64
> > > > > # arches where ports-gcc >4.9 exists. To be used again for modules
> > > > > -GCC49_ARCHS = aarch64 alpha amd64 arm hppa i386 mips64 mips64el
> > > > > powerpc powerpc64 riscv64 sparc64
> > > > > +PORTSGCC_ARCHS = aarch64 alpha amd64 arm hppa i386 mips64 mips64el
> > > > > powerpc powerpc64 riscv64 sparc64
> > > > >
> > > > > # arches where there is a C++11 compiler, either clang in base or
> > > > > ports-gcc
> > > > > -CXX11_ARCHS = ${CLANG_ARCHS} ${GCC49_ARCHS}
> > > > > +CXX11_ARCHS = ${CLANG_ARCHS} ${PORTSGCC_ARCHS}
> > > > > DEBUGINFO_ARCHS = aarch64 amd64
> > > > >
> > > > > .for PROP in ALL APM BE LE LP64 CLANG GCC4 GCC49 MONO LLVM LUAJIT \
> > > > ^^^^^
> > > > this needs changing too
> > > >
> > >
> > > As this step?
> >
> > I think it should be - the above xx_ARCHS are used to set 'xx' in
> > PROPERTIES:
> >
> > .for PROP in ALL APM BE LE LP64 CLANG GCC4 GCC49 MONO LLVM LUAJIT \
> > CXX11 OCAML_NATIVE OCAML_NATIVE_DYNLINK GO \
> > LLD RUST DEBUGINFO
> > . for A B in ${MACHINE_ARCH} ${ARCH}
> > . if !empty(${PROP}_ARCHS:M$A) || !empty(${PROP}_ARCHS:M$B)
> > PROPERTIES += ${PROP:L}
> > . endif
> > . endfor
> > .endfor
> >
> > I just fixed math/hdf5 and telephony/asterisk because neither of them
> > need to set ONLY_FOR_ARCHS themselves, so no need to touch those any
> > more.
> >
>
> Make sense and thanks for fix.
>
> What ends with this diff:
>
> Index: src/share/man/man5/bsd.port.arch.mk.5
> ===================================================================
> RCS file: /cvs/src/share/man/man5/bsd.port.arch.mk.5,v
> diff -u -p -r1.16 bsd.port.arch.mk.5
> --- src/share/man/man5/bsd.port.arch.mk.5 22 Jun 2026 17:14:35 -0000
> 1.16
> +++ src/share/man/man5/bsd.port.arch.mk.5 20 Oct 2026 16:07:51 -0000
> @@ -87,7 +87,6 @@ It will set up the following variables f
> .It Ev CXX11_ARCHS
> .It Ev DEBUGINFO_ARCHS
> .It Ev GCC4_ARCHS
> -.It Ev GCC49_ARCHS
> .It Ev GO_ARCHS
> .It Ev LE_ARCHS
> .It Ev LIBCXX
> @@ -99,6 +98,7 @@ It will set up the following variables f
> .It Ev MONO_ARCHS
> .It Ev OCAML_NATIVE_ARCHS
> .It Ev OCAML_NATIVE_DYNLINK_ARCHS
> +.It Ev PORTSGCC_ARCHS
> .It Ev PROPERTIES
> .It Ev RUST_ARCHS
> .It Ev IGNORE-<sub>
> Index: src/share/man/man5/bsd.port.mk.5
> ===================================================================
> RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
> diff -u -p -r1.656 bsd.port.mk.5
> --- src/share/man/man5/bsd.port.mk.5 14 Sep 2026 00:17:01 -0000 1.656
> +++ src/share/man/man5/bsd.port.mk.5 20 Oct 2026 16:07:52 -0000
> @@ -1473,7 +1473,7 @@ in effect,
> and
> .Ev MODCLANG_ARCHS
> default to
> -.Sq ${GCC49_ARCHS}
> +.Sq ${PORTSGCC_ARCHS}
> and
> .Sq ${LLVM_ARCHS}
> respectively.
> Index: ports/infrastructure/mk/arch-defines.mk
> ===================================================================
> RCS file: /cvs/ports/infrastructure/mk/arch-defines.mk,v
> diff -u -p -r1.120 arch-defines.mk
> --- ports/infrastructure/mk/arch-defines.mk 23 Sep 2026 13:45:41 -0000
> 1.120
> +++ ports/infrastructure/mk/arch-defines.mk 20 Oct 2026 16:07:52 -0000
> @@ -40,13 +40,13 @@ LLD_ARCHS = aarch64 amd64 arm i386 power
> # as well as available for PROPERTIES checks.
> LLVM_ARCHS = aarch64 amd64 arm i386 mips64 mips64el powerpc powerpc64
> riscv64 sparc64
> # arches where ports-gcc >4.9 exists. To be used again for modules
> -GCC49_ARCHS = aarch64 alpha amd64 arm hppa i386 mips64 mips64el powerpc
> powerpc64 riscv64 sparc64
> +PORTSGCC_ARCHS = aarch64 alpha amd64 arm hppa i386 mips64 mips64el powerpc
> powerpc64 riscv64 sparc64
>
> # arches where there is a C++11 compiler, either clang in base or ports-gcc
> -CXX11_ARCHS = ${CLANG_ARCHS} ${GCC49_ARCHS}
> +CXX11_ARCHS = ${CLANG_ARCHS} ${PORTSGCC_ARCHS}
> DEBUGINFO_ARCHS = aarch64 amd64
>
> -.for PROP in ALL APM BE LE LP64 CLANG GCC4 GCC49 MONO LLVM LUAJIT \
> +.for PROP in ALL APM BE LE LP64 CLANG GCC4 PORTSGCC MONO LLVM LUAJIT \
> CXX11 OCAML_NATIVE OCAML_NATIVE_DYNLINK GO \
> LLD RUST DEBUGINFO
> . for A B in ${MACHINE_ARCH} ${ARCH}
> Index: ports/infrastructure/mk/compiler.port.mk
> ===================================================================
> RCS file: /cvs/ports/infrastructure/mk/compiler.port.mk,v
> diff -u -p -r1.6 compiler.port.mk
> --- ports/infrastructure/mk/compiler.port.mk 24 Oct 2025 14:25:34 -0000
> 1.6
> +++ ports/infrastructure/mk/compiler.port.mk 20 Oct 2026 16:07:52 -0000
> @@ -36,7 +36,7 @@ _COMPILER_ARCHS += ${CLANG_ARCHS}
> CHOSEN_COMPILER ?= base-clang
> . endif
> . elif "$c" == "ports-gcc"
> -MODGCC4_ARCHS ?= ${GCC49_ARCHS}
> +MODGCC4_ARCHS ?= ${PORTSGCC_ARCHS}
> _MODGCC4_ARCH_USES = No
> _COMPILER_ARCHS += ${MODGCC4_ARCHS}
> . for _i in ${MODGCC4_ARCHS}
> Index: ports/lang/gcc/16/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/16/Makefile,v
> diff -u -p -r1.31 Makefile
> --- ports/lang/gcc/16/Makefile 20 Oct 2026 00:24:47 -0000 1.31
> +++ ports/lang/gcc/16/Makefile 20 Oct 2026 16:07:52 -0000
> @@ -1,6 +1,6 @@
> # When updating/switching to a new version, remember to adapt: devel/meson
>
> -ONLY_FOR_ARCHS = ${GCC49_ARCHS}
> +ONLY_FOR_ARCHS = ${PORTSGCC_ARCHS}
>
> ONLY_FOR_ARCHS-ada = amd64 mips64 i386 powerpc
> ONLY_FOR_ARCHS-dlang = aarch64 amd64 arm i386 mips64 powerpc powerpc64 \
> Index: ports/lang/gcc/16/gcc4.port.mk
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/16/gcc4.port.mk,v
> diff -u -p -r1.2 gcc4.port.mk
> --- ports/lang/gcc/16/gcc4.port.mk 25 Sep 2026 20:20:11 -0000 1.2
> +++ ports/lang/gcc/16/gcc4.port.mk 20 Oct 2026 16:07:52 -0000
> @@ -1,4 +1,4 @@
> -MODGCC4_ARCHS ?= ${GCC49_ARCHS}
> +MODGCC4_ARCHS ?= ${PORTSGCC_ARCHS}
> MODGCC4_LANGS ?=
>
>
>
>
> --
> wbr, Kirill
>
