På mandag 4. august 2025 kl. 21:01, Kirill A. Korinsky
<kirill@korins.ky> skrev:

> ports@,
> 
> to move forward with update of lang/gcc I need fresh gas.
> 
> Changes:
> - it needs GNU make;
> - almost all patches not required anymore.
> 
> BTW a hunk for patches/patch-gas_doc_as_info looks wrong, but this patch
> contains some control codes. The good news that it should be removed.
> 
> Tested on -current amd64 and arm64.
> 
> Thus, I had sent it twice because the first time I forgot about subject.
> 
> Ok?
> 

Tested on -current/amd64.

cd /usr/ports/devel/gas/ && patch -l -p0 -E < /tmp/gas-2.45.patch
cd /usr/ports/devel/gas/ && make update clean && make distclean

Built fine on my end.

Hope this helps while gcc-15 restarts building.
(My laptop is not fast.)

Have a good one and take care.


> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/gas/Makefile,v
> diff -u -p -r1.6 Makefile
> --- Makefile 12 Dec 2023 00:52:55 -0000 1.6
> +++ Makefile 4 Aug 2025 18:34:45 -0000
> @@ -1,9 +1,8 @@
> COMMENT = GNU assembler
> 
> -V = 2.31.1
> +V = 2.45
> DISTNAME = binutils-$V
> PKGNAME = gas-$V
> -REVISION = 0
> 
> CATEGORIES = devel
> 
> @@ -27,6 +26,8 @@ CONFIGURE_ARGS += --disable-ld \
> --disable-install-libbfd \
> --disable-shared \
> --disable-host-shared
> +
> +USE_GMAKE = yes
> 
> LIBTOOL_FLAGS = --tag=disable-shared
> 
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/gas/distinfo,v
> diff -u -p -r1.2 distinfo
> --- distinfo 26 Dec 2018 19:47:27 -0000 1.2
> +++ distinfo 4 Aug 2025 18:34:45 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (binutils-2.31.1.tar.gz) = 6I+NNr0KddN2WkrQiNgZ41+NesYogEl4Di/vytGN3og=
> -SIZE (binutils-2.31.1.tar.gz) = 40476369
> +SHA256 (binutils-2.45.tar.gz) = ij60sQ5wUzEnkPIe4aOPfiu9b0CWq7WQ00KeURlZLZY=
> +SIZE (binutils-2.45.tar.gz) = 52753230
> Index: patches/patch-bfd_Makefile_in
> ===================================================================
> RCS file: patches/patch-bfd_Makefile_in
> diff -N patches/patch-bfd_Makefile_in
> --- patches/patch-bfd_Makefile_in 11 Mar 2022 18:50:04 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -Index: bfd/Makefile.in
> ---- bfd/Makefile.in.orig
> -+++ bfd/Makefile.in
> -@@ -459,7 +459,7 @@ AUTOMAKE_OPTIONS = no-dist foreign
> - ACLOCAL_AMFLAGS = -I . -I .. -I ../config
> - INCDIR = $(srcdir)/../include
> - CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
> --SUBDIRS = doc po
> -+SUBDIRS = po
> - bfddocdir = doc
> - libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \
> - @SHARED_LDFLAGS@ $(am__empty)
> Index: patches/patch-bfd_config_bfd
> ===================================================================
> RCS file: patches/patch-bfd_config_bfd
> diff -N patches/patch-bfd_config_bfd
> --- patches/patch-bfd_config_bfd 11 Mar 2022 18:50:04 -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,34 +0,0 @@
> -Index: bfd/config.bfd
> ---- bfd/config.bfd.orig
> -+++ bfd/config.bfd
> -@@ -81,7 +81,6 @@ case $targ in
> - arm*--aout | \
> - arm--coff | \
> - arm--netbsd | \
> -- arm--openbsd | \
> - arm--oabi | \
> - arm--riscix* | \
> - arm-epoc-pe* | \
> -@@ -244,6 +243,11 @@ case "${targ}" in
> - targ_selvecs="aarch64_elf64_be_vec arm_elf32_le_vec arm_elf32_be_vec"
> - want64=true
> - ;;
> -+ aarch64--openbsd)
> -+ targ_defvec=aarch64_elf64_le_vec
> -+ targ_selvecs="aarch64_elf64_be_vec arm_elf32_le_vec arm_elf32_be_vec"
> -+ want64=true
> -+ ;;
> - aarch64--fuchsia)
> - targ_defvec=aarch64_elf64_le_vec
> - targ_selvecs="aarch64_elf64_be_vec arm_elf32_le_vec arm_elf32_be_vec"
> -@@ -355,6 +359,10 @@ case "${targ}" in
> - targ_selvecs="arm_elf32_le_vec"
> - ;;
> - arm--netbsdelf)
> -+ targ_defvec=arm_elf32_le_vec
> -+ targ_selvecs="arm_elf32_be_vec"
> -+ ;;
> -+ arm--openbsd)
> - targ_defvec=arm_elf32_le_vec
> - targ_selvecs="arm_elf32_be_vec"
> - ;;
> Index: patches/patch-gas_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/devel/gas/patches/patch-gas_Makefile_in,v
> diff -u -p -r1.3 patch-gas_Makefile_in
> --- patches/patch-gas_Makefile_in 11 Mar 2022 18:50:04 -0000 1.3
> +++ patches/patch-gas_Makefile_in 4 Aug 2025 18:34:45 -0000
> @@ -1,7 +1,7 @@
> Index: gas/Makefile.in
> --- gas/Makefile.in.orig
> +++ gas/Makefile.in
> -@@ -1662,7 +1662,7 @@ cgen.@OBJEXT@: cgen.c cgen.h cgen-desc.h subsegs.h \
> +@@ -2150,7 +2150,7 @@ cgen.@OBJEXT@: cgen.c cgen.h cgen-desc.h subsegs.h \
> .PHONY: install-exec-local install-data-local
> .PHONY: install-exec-bindir install-exec-tooldir
> 
> Index: patches/patch-gas_configure_tgt
> ===================================================================
> RCS file: patches/patch-gas_configure_tgt
> diff -N patches/patch-gas_configure_tgt
> --- patches/patch-gas_configure_tgt 11 Mar 2022 18:50:04 -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,19 +0,0 @@
> -Index: gas/configure.tgt
> ---- gas/configure.tgt.orig
> -+++ gas/configure.tgt
> -@@ -127,6 +127,7 @@ case ${generic_target} in
> - case ${cpu}-${os} in
> - aarch64*-linux-gnu_ilp32) arch=aarch64:32 ;;
> - esac ;;
> -+ aarch64--openbsd) fmt=elf;;
> -
> - alpha--vms) fmt=evax ;;
> - alpha--osf*) fmt=ecoff ;;
> -@@ -153,6 +154,7 @@ case ${generic_target} in
> - arm--uclinux) fmt=elf em=linux ;;
> - arm--nacl) fmt=elf em=nacl ;;
> - arm--netbsdelf) fmt=elf em=nbsd ;;
> -+ arm--openbsd) fmt=elf em=nbsd ;;
> - arm--nto) fmt=elf ;;
> - arm-wince-pe | arm--wince | arm--mingw32ce | arm*--cegcc)
> - fmt=coff em=wince-pe ;;
> Index: patches/patch-gas_doc_as_info
> ===================================================================
> RCS file: patches/patch-gas_doc_as_info
> diff -N patches/patch-gas_doc_as_info
> --- patches/patch-gas_doc_as_info 11 Mar 2022 18:50:04 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -Index: gas/doc/as.info
> ---- gas/doc/as.info.orig
> -+++ gas/doc/as.info
> -@@ -13,8 +13,8 @@ Free Documentation License".
> -
> - INFO-DIR-SECTION Software development
> - START-INFO-DIR-ENTRY
> --* As: (as). The GNU assembler.
> --* Gas: (as). The GNU assembler.
> -+* As: (gas). The GNU assembler.
> -+* Gas: (gas). The GNU assembler.
> - END-INFO-DIR-ENTRY
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/gas/pkg/PLIST,v
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 12 Dec 2023 00:52:55 -0000 1.3
> +++ pkg/PLIST 4 Aug 2025 18:34:45 -0000
> @@ -1,4 +1,7 @@
> @conflict binutils-*
> @bin bin/gas
> +@info info/bfd.info
> +@info info/ctf-spec.info
> @info info/gas.info
> +@info info/sframe-spec.info
> @man man/man1/gas.1