Attachment 248259 Details for Bug 261180 – 0001-devel-ocaml-opam-Fix-build-on-armv7.patch

[patch] 0001-devel-ocaml-opam-Fix-build-on-armv7.patch

0001-devel-ocaml-opam-Fix-build-on-armv7.patch (text/plain), 2.58 KB, created by Benjamin Jacobs on 2024-02-08 14:46:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Jacobs

Created: 2024-02-08 14:46:46 UTC

Size: 2.58 KB

patch

obsolete

>From de075445e08206e01d6dfdaffcfdb2a77b6f357d Mon Sep 17 00:00:00 2001
>From: Benjamin Jacobs <freebsd@dev.thsi.be>
>Date: Wed, 7 Feb 2024 18:10:46 +0000
>Subject: [PATCH 1/2] devel/ocaml-opam: Fix build on armv7.
>
>The LLVM assembler chokes on the assembly generated by the ARM32
>backend of OCAML. Fixed by forcing binutils on ARM32.
>
>The OCaml compiler generates text relocations on all of its supported
>32 bits architectures, however the configure script only sets the -z
>notext linker flag in the x86 case. This change makes sure that this
>flag is used for the other architectures by setting LDFLAGS in the
>environment of the configure script.
>
>This commit may fix armv6 and powerpc as well, but this hasn't been
>verified.
>---
> devel/ocaml-opam/Makefile | 26 ++++++++++++++++++--------
> 1 file changed, 18 insertions(+), 8 deletions(-)
>
>diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile
>index d7e060451647..f2dae79f1ea6 100644
>--- a/devel/ocaml-opam/Makefile
>+++ b/devel/ocaml-opam/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	opam
> DISTVERSION=	2.1.5
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
> MASTER_SITES=	https://github.com/ocaml/opam/releases/download/${DISTVERSION}/
> PKGNAMEPREFIX=	ocaml-
>@@ -12,11 +12,11 @@ WWW=		https://opam.ocaml.org/
> 
> LICENSE=	LGPL21
> 
>-BROKEN_armv6=	ld: error: can't create dynamic relocation R_ARM_ABS32 against symbol: caml_program in readonly segment
>-BROKEN_armv7=	ld: error: can't create dynamic relocation R_ARM_ABS32 against symbol: caml_program in readonly segment
>-
> RUN_DEPENDS=	curl:ftp/curl \
>-		gpatch:devel/patch
>+		gpatch:devel/patch \
>+		${RUN_DEPENDS_${ARCH}}
>+RUN_DEPENDS_armv6= ${LOCALBASE}/bin/as:devel/binutils
>+RUN_DEPENDS_armv7= ${LOCALBASE}/bin/as:devel/binutils
> 
> USES=		gmake
> 
>@@ -26,6 +26,12 @@ CONFIGURE_ARGS=	--disable-checks
> MAKE_JOBS_UNSAFE=	yes
> ALL_TARGET=	cold-lib-ext cold-all
> 
>+LDFLAGS_armv6=	-Wl,-z,notext
>+LDFLAGS_armv7=	-Wl,-z,notext
>+LDFLAGS_powerpc=	-Wl,-z,notext
>+
>+NOPRECIOUSMAKEVARS=	yes
>+
> OPTIONS_DEFINE=		DARCS GIT MERCURIAL RSYNC
> OPTIONS_DEFAULT=	GIT RSYNC
> NO_OPTIONS_SORT=	yes
>@@ -37,13 +43,17 @@ GIT_RUN_DEPENDS=	git:devel/git
> MERCURIAL_RUN_DEPENDS=	${PY_MERCURIAL}
> RSYNC_RUN_DEPENDS=	rsync:net/rsync
> 
>-NOPRECIOUSMAKEVARS=	yes
>+.include <bsd.port.pre.mk>
>+
>+.if ${ARCH} == armv6 || ${ARCH} == armv7
>+USE_BINUTILS=	yes
>+.endif
> 
> pre-configure:
>-	cd ${WRKSRC} && ${MAKE_CMD} compiler
>+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} compiler)
> 
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam-installer
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>-- 
>2.43.0
>

Actions: View | Diff

Attachments on bug 261180: 230990 | 231075 | 231080 | 231087 | 232043 | 232044 | 248241 | 248242 | 248259 | 248260 | 248261 | 248262