From nobody Sat Feb 10 13:48:12 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TXBrD5bT1z59jRh; Sat, 10 Feb 2024 13:48:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TXBrD3ySvz4wlq; Sat, 10 Feb 2024 13:48:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707572892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dy+U1s1tYJ3KHrFdseovh1LyW/OQVc0kQBhmlfxfrsg=; b=Ty508UdP81lb+LG5tqeCD5c3QulVj/CqDq8l5i7X58FL8v0hT79oMBadyv9JIUh541SoJP MaODzMwHUxgGghaRlvkswYTrbS6V0AfC4k1JEVzaMgujZj84CtUvwDM3g9eAgy1JhRdhR+ P2TgAThiCOAF5/sFfi5ucWKYHMG1h0mTvs47h4nARUDN2O3lkGmAXGZa/U6ffaisHxMbkG ToopjUJauDs1/oipl+21SUM47/HLU63QpGH2VkD4eavMHycA7NBQ6ucQAI+YoUvlo+cqlM BXIn2tGBkq2kwsr5DO9QvEXOEvKASNxIlIDGuEXSeg0c57TE5fUlyWuzJdHj4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707572892; a=rsa-sha256; cv=none; b=vlmTJmJTPVjd6F5PJJVp62BLZDvZJJ6bV9AOGmyaUn0cUabjZ+P2UzBhbPNErE7ioj+zp8 kI10pFg2mFbYupJsVE65RnIZbE6uGIcKhgFaMXmMDYc3P/iJ7fzCxPt7XRDu/CSbzGkxut bCe+lJ02QSnK/e/U5QuX1YTjwrQ4JP60QB477d2IY3D5mWUcyT30c67MhbQCWqcdvxqTO9 T5L/3a3j7g10QUwTAY97sHbV6buPGMXQi+e/sRAa3MPnQ8Lz6Sa4rsganP2L+OpNHeaQyY hIjETAovzSX+FHUZaTVzHGkK0dsUuocxbH3cJPT2KG8P2H3DvJf/cXspTsEz0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707572892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dy+U1s1tYJ3KHrFdseovh1LyW/OQVc0kQBhmlfxfrsg=; b=cqenyl44ZxaTJlNE7LsHgZlfBHdMLkCnHMUADfEa784Imw9+PcLPmlnLfnxJdfwsl3TM64 fa7/KDsdRwmhIFSUF4E3DeTvtuaGJ7ZqiGl9b9hbLSVE/TV0u/7amRlOqzDsyRTmIyuLip N1UO6Q4O7jGC7U9JG7Yl/M52Wa2Ru5psH91HPO/vVkYNin7aECp2vWKlOd2BMAVSdQPbsP 4by1HW+yPAglaqiFdTn35cwWdXX6TRtwDQ/1DTmdMGhGvxWXs7/tGTvROuMYZGYN0E/Dab ajm2OsxBCfuCfEdMIJHD5DEsq309+brepDZPoe/f3LaCZj3qfU2ieB8Wk+N5jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TXBrD34F7zJpd; Sat, 10 Feb 2024 13:48:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41ADmCDM064755; Sat, 10 Feb 2024 13:48:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41ADmCZk064752; Sat, 10 Feb 2024 13:48:12 GMT (envelope-from git) Date: Sat, 10 Feb 2024 13:48:12 GMT Message-Id: <202402101348.41ADmCZk064752@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 84ef6c1c6125 - main - devel/ocaml-opam: Fix build on armv7. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84ef6c1c612525c29dd4c271ea4e91c2d54074af Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=84ef6c1c612525c29dd4c271ea4e91c2d54074af commit 84ef6c1c612525c29dd4c271ea4e91c2d54074af Author: Benjamin Jacobs AuthorDate: 2024-02-07 18:10:46 +0000 Commit: Robert Clausecker CommitDate: 2024-02-10 13:42:26 +0000 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. PR: 261180 MFH: 2024Q1 Reported by: fuz Approved by: hannes@mehnert.org (maintainer) --- devel/ocaml-opam/Makefile | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile index d7e060451647..e8274f7019dd 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,13 +12,17 @@ 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 +ARCH!= uname -p +.if ${ARCH} == armv6 || ${ARCH} == armv7 +USE_BINUTILS= yes +.endif GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-checks @@ -26,6 +30,13 @@ 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 +LDFLAGS+= ${LDFLAGS_${ARCH}} + +NOPRECIOUSMAKEVARS= yes + OPTIONS_DEFINE= DARCS GIT MERCURIAL RSYNC OPTIONS_DEFAULT= GIT RSYNC NO_OPTIONS_SORT= yes @@ -37,10 +48,8 @@ GIT_RUN_DEPENDS= git:devel/git MERCURIAL_RUN_DEPENDS= ${PY_MERCURIAL} RSYNC_RUN_DEPENDS= rsync:net/rsync -NOPRECIOUSMAKEVARS= yes - pre-configure: - cd ${WRKSRC} && ${MAKE_CMD} compiler + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} compiler) post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam-installer