23.09.2025 23:12, Kirill A. Korinsky пишет:
> Folks,
>
> here a diff which drops @conflict between devel/gas and devel/binutils.
>
> I can't merge devel/gas into devel/binutils because it depends on ports-gcc
> which depends on devel/gas.
>
> Instead I jsut nuke gas from devel/binutils, and it looks safe since both
> ports is synchronized.
>
> Thoughts? Ok?
I ran into the conflict some time ago and it prevented me from building
something, although I forgot what... would be hice to see it resolved.
Comment inline.
>
> Index: gas/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/devel/gas/Makefile,v
> diff -u -p -r1.8 Makefile
> --- gas/Makefile 15 Aug 2025 15:46:46 -0000 1.8
> +++ gas/Makefile 23 Sep 2025 19:40:47 -0000
> @@ -1,7 +1,8 @@
> COMMENT = GNU assembler
>
> +# keep version synchronized with devl/binutils
> V = 2.45
> -REVISION = 0
> +REVISION = 1
> DISTNAME = binutils-$V
> PKGNAME = gas-$V
>
> Index: gas/pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/devel/gas/pkg/PLIST,v
> diff -u -p -r1.3 PLIST
> --- gas/pkg/PLIST 12 Dec 2023 00:52:55 -0000 1.3
> +++ gas/pkg/PLIST 23 Sep 2025 19:38:38 -0000
> @@ -1,4 +1,3 @@
> -@conflict binutils-*
> @bin bin/gas
> @info info/gas.info
> @man man/man1/gas.1
> Index: binutils/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/devel/binutils/Makefile,v
> diff -u -p -r1.19 Makefile
> --- binutils/Makefile 17 Aug 2025 21:21:48 -0000 1.19
> +++ binutils/Makefile 23 Sep 2025 20:06:55 -0000
> @@ -1,6 +1,8 @@
> COMMENT = GNU binary utilities
>
> +# keep version synchronized with devl/gas
> DISTNAME = binutils-2.45
> +REVISION = 0
> EXTRACT_SUFX = .tar.bz2
>
> CATEGORIES = devel
> @@ -18,6 +20,7 @@ COMPILER_LANGS = c
> WANTLIB += c z zstd
>
> LIB_DEPENDS += archivers/zstd
> +RUN_DEPENDS += devel/gas
>
> SITES = ${SITE_GNU:=binutils/}
>
> @@ -35,7 +38,10 @@ CONFIGURE_ARGS += --disable-gprof \
> USE_GMAKE = Yes
>
> post-install:
> + @rm ${PREFIX}/bin/gas
> + @rm ${PREFIX}/info/as.info
> @rm ${PREFIX}/info/bfd.info
> + @rm ${PREFIX}/man/man1/gas.1
> @rm -rf ${PREFIX}/*-unknown-openbsd${OSREV}
>
> .include <bsd.port.mk>
> Index: binutils/pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/devel/binutils/pkg/PLIST,v
> diff -u -p -r1.3 PLIST
> --- binutils/pkg/PLIST 15 Jan 2023 20:02:47 -0000 1.3
> +++ binutils/pkg/PLIST 23 Sep 2025 20:07:15 -0000
> @@ -1,7 +1,5 @@
> -@conflict gas-*
binutils will still conflict with old gas, so I think this would be correct:
@conflict gas-<2.45p1
> @bin bin/gaddr2line
> @bin bin/gar
> -@bin bin/gas
> @bin bin/gc++filt
> @bin bin/gelfedit
> @bin bin/gnm
> @@ -12,12 +10,10 @@
> @bin bin/gsize
> @bin bin/gstrings
> @bin bin/gstrip
> -@info info/as.info
> @info info/binutils.info
> @info info/sframe-spec.info
> @man man/man1/gaddr2line.1
> @man man/man1/gar.1
> -@man man/man1/gas.1
> @man man/man1/gc++filt.1
> @comment @man man/man1/gdlltool.1
> @man man/man1/gelfedit.1
>
>
