From nobody Sat Jul 15 00:43:09 2023 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 4R2qML0V79z4nM6B; Sat, 15 Jul 2023 00:43:10 +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 4R2qML03Rxz4QYl; Sat, 15 Jul 2023 00:43:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689381790; 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=AgiTFM96HN3mMzRDhvjSknO6niAog/2JGXCun+vnVec=; b=Zb6+vEI6x74c7YsHAixH+4EZ/9kHzGU+lVwWlGXTpHHs9/u1+iOIjuxvPH4Dk+ToJcgI9m K1fSXVxO8loNENDTu6w6fzPLJgxNcKG5ObInV2m+slJt+Qq477NnD6GlW7th0nOb/i2yQS b4Ac4ArgdQZcWyOsAar58gSkOdXpqzRRwTWHjcT13QM7ysUwsnW3R9026Ga9CQ27RDF3LA hcD4a3z45OBdkiyEN0Lizse+ZPc1oiIW1S3xbIqMstyg09y2+8E/rFO5V8NZ9TOB9/igqP r49OTmJIhHxS3qlHEKSXNhLtHKDJM5z+urvHrUCkh393gLRRw1hrhFJrgwqHfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689381790; 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=AgiTFM96HN3mMzRDhvjSknO6niAog/2JGXCun+vnVec=; b=VxtHH9tWNkkEuLIOqHgcSxIg1yc67YnLdivHhK+cTKUtt+cFSDO67q3tVqk+KHUIrUrr/P BGDnYobT2XJRUIt7i8ySijrd/pxS5MiWO+64SfYEB/AW/E0pFKaXbs7lrQZRF0zqupFR1n Vxp2h80vegcrVB+X7C5tTQlF/ChTMIfe+69fEGArQLimukOphUmTz1s0OvB0PHZ2a2tKTL n6mgqGWMt+Luc7by/9142e/D22O09rvKNpcpSVOJXPAXWEDjEeBTWmqbhE0fTDDUZrW+CX SJ3hEiAa8SAKVOLf69Z9bt8bHOMSQG/nFzuhEgipP1lfBBHTKSbWkF1L+sZrzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689381790; a=rsa-sha256; cv=none; b=V7oVVsXqT3sYAYw+uhc8+7ZDfXQtkWCar2xyZBihTIeN/EDY4N/F/HwE+V4KgJI0dcxc9s Fx/16VmI4BHihmoU9V18meYHFcHs4jO+mpxBQW/wfgkTNrqqbnLCZlvJLYT4cuwNFt+NQ6 ZInfgCEp7YFUSrhSfGhil6etUhJD25xoHKo99koP2qdKCWlC3kwcNO52Q6WyqnVUvk4Wfm GfB6JOaOw3XESVVxI/4VKG0Giv1r02fo+4IWoLxXWM5rgeCz29uud+ZhQW+60K4erdbdy6 hgkkg4N5QWqp6KN4hgvAIa0VwBhvHL13dIjAuD5waxxHrkle3APG3eDuwkrqJQ== 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 4R2qMK6DnXzfmV; Sat, 15 Jul 2023 00:43:09 +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 36F0h9pF021504; Sat, 15 Jul 2023 00:43:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36F0h9Tr021503; Sat, 15 Jul 2023 00:43:09 GMT (envelope-from git) Date: Sat, 15 Jul 2023 00:43:09 GMT Message-Id: <202307150043.36F0h9Tr021503@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 85ffdceb6983 - main - lang/ocaml: fix build on powerpc* 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85ffdceb69831fd6f4f188784aee626414ce5929 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=85ffdceb69831fd6f4f188784aee626414ce5929 commit 85ffdceb69831fd6f4f188784aee626414ce5929 Author: Piotr Kubaj AuthorDate: 2023-07-15 00:41:39 +0000 Commit: Piotr Kubaj CommitDate: 2023-07-15 00:42:54 +0000 lang/ocaml: fix build on powerpc* 1. SYSTEM_ARCH needs to be set to power. 2. To override LD, -fuse-ld=bfd needs to be appended to CC. --- lang/ocaml/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 3e4b22ddb1dc..93eb441d046e 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -45,11 +45,10 @@ awk_CMD= /usr/bin/awk SHEBANG_FILES= tools/ocaml-instr-graph tools/ocaml-instr-report CONFIGURE_ARGS= --prefix="${PREFIX}" -CONFIGURE_ENV= CC="${CC}" \ - LDFLAGS="${LDFLAGS}" \ +CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \ ASPP="${CC} -c" \ PARTIALLD="${LD} -r" -MAKE_ENV= SYSTEM_ARCH="${ARCH}" +MAKE_ENV= SYSTEM_ARCH="${ARCH:C/powerpc.*/power/}" OPTIONS_DEFINE= X11 THREADS DOCS EXAMPLES OPTIONS_DEFAULT=X11 THREADS @@ -76,11 +75,13 @@ DOCS_DISTFILES= ${DISTNAME:R}-refman-html.tar.gz:docs \ .include .if ${ARCH} == armv6 || ${ARCH} == armv7 -CONFIGURE_ENV+= AS="${AS} ${ASFLAGS} -meabi=5" +CONFIGURE_ENV+= AS="${AS} ${ASFLAGS} -meabi=5" \ + CC="${CC}" .elif ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le -LLD_UNSAFE= yes +CONFIGURE_ENV+= CC="${CC} -fuse-ld=bfd" .else -CONFIGURE_ENV+= AS="${AS} ${ASFLAGS}" +CONFIGURE_ENV+= AS="${AS} ${ASFLAGS}" \ + CC="${CC}" .endif .if defined(NO_PROFILE) || ${ARCH:Mpowerpc} || ${ARCH:Mamd64}