On Tue, Dec 12, 2023 at 03:36:52AM +0000, Brian Callahan wrote:
> On 12/11/2023 7:42 PM, Brian Callahan wrote:
> > On 12/11/2023 6:34 PM, Stuart Henderson wrote:
> >> On 2023/12/11 16:40, Lorenz (xha) wrote:
> >>> FYI hare only needs gas and not the complete binutils package. and gas
> >>> is just needed because the "as" in the base system is too old.
> >>>
> >>
> >> Will the version from devel/gas (2.31.1) also work? If so, you could do
> >> this to prefer binutils-* but use gas-* if already installed.
> >>
> >
> > For some reason, I thought devel/gas was too old to have riscv64
> > support, but it seems I misremembered that.
> >
> > It works fine for amd64, I will check on arm64 and riscv64.
> >
> > I don't see a reason not to use devel/gas if we can and just forget
> > about devel/binutils. I wouldn't want people to install hare and then
> > try to install gcc only to have it fail for something easily fixed.
> >
> > OK to replace devel/binutils with devel/gas and bump, assuming arm64 and
> > riscv64 check out?
> >
>
> Now after testing arm64 and riscv64:
> amd64 and arm64 work with devel/gas. riscv64 does not work with
> devel/gas and requires devel/binutils.
>
> Attached is a patch that tweaks things. Also adds a patch from tobhe@
> that got missed during import that has been upstreamed.
>
> OK?
ok tobhe@
>
> ~Brian
> Index: hare/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/hare/hare/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- hare/Makefile 3 Dec 2023 19:07:28 -0000 1.1.1.1
> +++ hare/Makefile 12 Dec 2023 03:16:59 -0000
> @@ -17,7 +17,7 @@ do-gen:
> cp ${WRKSRC}/configs/openbsd.mk ${WRKSRC}/config.mk
> sed -i "s/aarch64-//g" ${WRKSRC}/config.mk
> sed -i "s/riscv64-//g" ${WRKSRC}/config.mk
> -.if ${MACHINE_ARCH:Marm64}
> +.if ${MACHINE_ARCH:Maarch64} || ${MACHINE_ARCH:Mriscv64}
> echo "ARCH = $$(arch -s)" >> ${WRKSRC}/config.mk
> .endif
>
> Index: harec/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/hare/harec/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- harec/Makefile 3 Dec 2023 19:07:28 -0000 1.1.1.1
> +++ harec/Makefile 12 Dec 2023 03:16:59 -0000
> @@ -1,4 +1,5 @@
> DISTNAME = harec-0.0.0pl20231202
> +REVISION = 0
>
> WANTLIB += c m
>
> @@ -7,9 +8,15 @@ COMPILER = base-clang ports-gcc
>
> BUILD_DEPENDS = ${RUN_DEPENDS}
>
> -# Needs a newer GNU as
> -RUN_DEPENDS = devel/binutils \
> - lang/qbe
> +RUN_DEPENDS = lang/qbe
> +
> +# All archs need a newer GNU as
> +# gas-2.31.1 is not new enough for riscv64
> +.if ${MACHINE_ARCH:Mriscv64}
> +RUN_DEPENDS += devel/binutils
> +.else
> +RUN_DEPENDS += devel/gas
> +.endif
>
> CONFIGURE_STYLE = simple
> CONFIGURE_ARGS = --sysconfdir="${SYSCONFDIR}"
> Index: harec/patches/patch-rt_+openbsd_start+aarch64_s
> ===================================================================
> RCS file: harec/patches/patch-rt_+openbsd_start+aarch64_s
> diff -N harec/patches/patch-rt_+openbsd_start+aarch64_s
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ harec/patches/patch-rt_+openbsd_start+aarch64_s 12 Dec 2023 03:16:59
> -0000
> @@ -0,0 +1,11 @@
> +Already upstreamed, from tobhe@
> +
> +Index: rt/+openbsd/start+aarch64.s
> +--- rt/+openbsd/start+aarch64.s.orig
> ++++ rt/+openbsd/start+aarch64.s
> +@@ -5,5 +5,4 @@ _start:
> + mov x30, #0
> + mov x0, sp
> + add sp, x0, #-16
> +- and sp, sp, #-16
> + b rt.start_ha
