From nobody Sat Feb 10 13:49:33 2024 X-Original-To: dev-commits-ports-branches@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 4TXBsn6wtZz59jZb; Sat, 10 Feb 2024 13:49:33 +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 4TXBsn6Gc9z4xMS; Sat, 10 Feb 2024 13:49:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707572973; 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=mEe5m8HkyDTUlfW5tyfxCdSR5GazTwhLEct08DAV+0A=; b=wYP5CKqyAhwDXbYjb8g44rFvn5PCna4SqTYaS3YWcStJe2NSaEoo/DLNTJzcuO8x+cqQmk J3sXy/5E4GmTpPQi6Y5EqnU1s5K3YpwJOFnXC/cLKaqg1SdxbJk69ulsTBQOGCui3y7hNt aVQ9ziTvXW3T6m5ab7T+KPbPEWGZ0lh74VPMYMxak15SZBYJU6pBlruf0IBexUmAWL5661 RAWDS7lZiXfOlHEmTgMCMCrJB1XCd/Ktfv5rsuLWSjQn5AVE1a9OQrkPKUKpQrD/NTlFs8 VGAjWOTHaN80yIaqa4LvNixTIQpDmFXwqWJlUwJEDwPcpaCZvjIUFOaQ0Ilp9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707572973; a=rsa-sha256; cv=none; b=GDS+hDLYKzbud7lSVadZ3ztvrde/oDYhOx9DoxRK4dHcj2B++zMeVKUfkKU1g90yopLuHz XKAMhYJegXEH/HDOOaWOfk5TnW8gbVdZdJZd/IQH7cwphKS4+OzmtKTmcjlOpljNpP2HUE h13XcHjZJcuKU0E7r9RWKrTBj236wjrbOrQRIb9D63vWEZZkuUmC86i0vLgtgQDUAQ82le sbZ8ZO66VjikpewAEV3muen/9KieU3hS30FYXKNrKeu7i1G8JuJG86CQm5zrNOQs4brlFc Yo7zZylFp4mYBSkURciYpeEBHKnQIPX07jBc6tX0unmjyB+knwZQFOGhpUsRuw== 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=1707572973; 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=mEe5m8HkyDTUlfW5tyfxCdSR5GazTwhLEct08DAV+0A=; b=L9RMO3E9xaztI9UGtF3hjqChMdXdlTj7fEplGE2awYq29fwrqrI7CB0JzJOgJPvxtF8XPM rZjX9aOL4l/5ZrZ+qn+Yu5cZnblYzQ8NAICUL88FUYrdGvL5z7vZO5dNWcebLGvUJjb4Ky 1rkuqt8cuuvtadYmVlIvf8Sr7q6TFecCbZGBVUVo5HO0G/isFJXSekmb6SfJrPys5B3C16 2i5+q+Ne45RVZSLUp5xxw++Oh3McRHdx2PMGsAlc4oV4X8ppw9gSfjIxiK18cK5Tf1X58P QK9Eq2Te5y7/fC0IauIfibDzBJlTeoQ5BMAP9/aytVXg/yNzgEzykLUXHM/Ctw== 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 4TXBsn5JMlzJZZ; Sat, 10 Feb 2024 13:49:33 +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 41ADnXUM065255; Sat, 10 Feb 2024 13:49:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41ADnXA1065252; Sat, 10 Feb 2024 13:49:33 GMT (envelope-from git) Date: Sat, 10 Feb 2024 13:49:33 GMT Message-Id: <202402101349.41ADnXA1065252@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: e8511dc88840 - 2024Q1 - devel/ocaml-opam: Fix build on armv7. List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2024Q1 X-Git-Reftype: branch X-Git-Commit: e8511dc888403b210b509c00f0b3f8e9c081d81a Auto-Submitted: auto-generated The branch 2024Q1 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=e8511dc888403b210b509c00f0b3f8e9c081d81a commit e8511dc888403b210b509c00f0b3f8e9c081d81a Author: Benjamin Jacobs AuthorDate: 2024-02-07 18:10:46 +0000 Commit: Robert Clausecker CommitDate: 2024-02-10 13:49:20 +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) (cherry picked from commit 84ef6c1c612525c29dd4c271ea4e91c2d54074af) --- 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