From: Kirill A. Korinsky Subject: Re: devel/gas: update to 2.45 To: ports@openbsd.org, pascal@stumpf.co Date: Tue, 05 Aug 2025 17:37:20 +0200 On Tue, 05 Aug 2025 13:23:38 +0200, Jeremie Courreges-Anglas wrote: > > Can you please explain why the patch can be dropped? > Can you please explain why the patch can be dropped? The package > name, the executable and more importantly the info file are named > "gas", for info file handling our install-info needs the info file > name to match:2 > > m2 /usr/ports/devel/gas$ make deinstall > ===> Deinstalling for gas-2.45 > install-info: warning: no entries found for `/usr/local/info/gas.info'; nothing deleted > gas-2.45: ok > > Also please do not install > > > +@info info/bfd.info > > +@info info/ctf-spec.info > > @info info/gas.info > > +@info info/sframe-spec.info > > since the port doesn't install those libraries. See devel/binutils > for an example. > I think I've used bad wording. I mean that some patches need to be droped: - patch-bfd_config_bfd - patch-gas_configure_tgt Thanks for catch that I had installed wrong info, it's cleaned up. Also, I was a bit confused yesterday with patch-gas_doc_as_info because make update-patches added the second, huge hunk. I haven't checked yesterday has it got it already, but aparently it doesn't and it local issue. > > Tested on -current amd64 and arm64. > > > > Thus, I had sent it twice because the first time I forgot about subject. > > > > Ok? > > As you may have noticed, devel/gas is used by lang/gcc/8 and > lang/gcc/11 for machine code generation on all our platforms. So this > update won't be good to commit until it's been tested on enough > architectures with lang/gcc/8, with "enough" being flexible but > containing at the very least amd64, arm64, i386, riscv64, sparc64 and > preferably also powerpc, powerpc64 and mips64. *cough* armv7? *cough* > > Build-testing all the lang/gcc/8 consumers + running the numpy > testsuite should be enough, but a full bulk would be nice on fast > archs. > > Currently taking care of testing this on amd64, arm64, riscv64 and > sparc64. > Thanks, I'll run build on mips64 but I have no idea how long does it take. And it hasn't got numpy. So, just build two gcc. Yeah. Anyway, updated diff. 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 5 Aug 2025 15:32:22 -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 @@ -28,6 +27,8 @@ CONFIGURE_ARGS += --disable-ld \ --disable-shared \ --disable-host-shared +USE_GMAKE = yes + LIBTOOL_FLAGS = --tag=disable-shared post-extract: @@ -35,5 +36,6 @@ post-extract: post-install: cd ${PREFIX}/info && mv as.info gas.info + cd ${PREFIX}/info && rm bfd.info ctf-spec.info sframe-spec.info .include 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 5 Aug 2025 15:32:22 -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 5 Aug 2025 15:32:22 -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: /cvs/ports/devel/gas/patches/patch-gas_doc_as_info,v diff -u -p -r1.3 patch-gas_doc_as_info --- patches/patch-gas_doc_as_info 11 Mar 2022 18:50:04 -0000 1.3 +++ patches/patch-gas_doc_as_info 5 Aug 2025 15:32:22 -0000 @@ -10,3 +10,5 @@ Index: gas/doc/as.info +* As: (gas). The GNU assembler. +* Gas: (gas). The GNU assembler. END-INFO-DIR-ENTRY + + ␟