From nobody Fri Jul 28 08:13:37 2023 X-Original-To: dev-commits-ports-main@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 4RC0l529X8z4q3tN; Fri, 28 Jul 2023 08:13:37 +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 4RC0l51lHGz4Pvh; Fri, 28 Jul 2023 08:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690532017; 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=9+lArz6RguI9/+MKKDovMrKBkJ5I/tcATF10F2Ym4UQ=; b=x9iMnd4jV2NEi9WDHKnz0eBPUYKaqYlhLwIubhfMcQyiIN04CrzEGcDvslhh+gIVRfAVJJ k2rUUMZNhzfEfGCZQOP+tpR9YLNw3v2MJHHE0d6THnurQkw70B4PlXTtYR7/oqMf972VXx sn3Yve3yy6BsKxKMUCQI9r8xX1d0HxDJSMt85kpqyHIV+ikwTFwRhYNq7AOhC5zuE0VZgw DmsFxQmrP/NZ6UNMLhipp3Q98l/k5P17Wb+jOjP2pQVg5ewNOQMg000pxyo2V6xls3CEq7 M56MmVU1ONWY3OYIAY3ZwbjMIbC7582z2Ic0uDcQzA2mbqxTdg10//dbsufgjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690532017; 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=9+lArz6RguI9/+MKKDovMrKBkJ5I/tcATF10F2Ym4UQ=; b=IroKzgnffhG3Mw/8s2OI7GhKdoUReCvsyo0RD8JOf0oQ//52H+k69Wedrn12bcq1OKKWRx hpfpUv3IjZ2z4gTNuy+qfU5P6jA4tEE09j+VOFNcXth67AmfgymdKZLCjB4C9JrtXfVKet tfIw1PBnNezwO0ww79hqcNOhUBdNOdFeraJlR5xHWve4//PUJvLlgcUZs63G6adYpsB/98 k4EGUDn2OgWIISkStRPWiRnW3kBRdjMjgHBEz+ako0Cdl/J/NllPfoO+KNoMywV4d4zdC4 GxesC55uZPewL038+Cjo++6cwA8bqk2J0f1d5qBWoW0Dz8Hl8/weasmHHVY0fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690532017; a=rsa-sha256; cv=none; b=GFANHWtcV2jZoTP1MZ8mRFjSSVa3NX5dIrVdg5OFP+ldbSKKs5lmO7lbNKlHmLXja/wXhj uD0Cgkovis2d683K1reyh0JKWAsc8APCE1g2qMoLFgLC4WjDnqfoI6Y6Beyan6p4S6ji3i rO8tK8ec52nZe1pejMoUL7Ye3XVF2AQxIhwP6wWYgXublmgfQSTUqUux4HStAbQong0bOi gKjU0P1OrKmcTE9Ufo3+GhYt7yv8F1CG0FLEWmsRvsUVqTNlDc70jafsEGNwG5vaQtqR2j JMlExrQolYOsq543Ap7oU7FdPSldKNwe/WIJhxTiUxb358IrRVY3GM0QRofzoQ== 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 4RC0l50pWmzjjq; Fri, 28 Jul 2023 08:13:37 +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 36S8DbLZ080015; Fri, 28 Jul 2023 08:13:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36S8DbNK080014; Fri, 28 Jul 2023 08:13:37 GMT (envelope-from git) Date: Fri, 28 Jul 2023 08:13:37 GMT Message-Id: <202307280813.36S8DbNK080014@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 7638e6aabb64 - main - lang/ocaml: Fix build on aarch64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7638e6aabb64ffecd7e41704a580237cf6095446 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=7638e6aabb64ffecd7e41704a580237cf6095446 commit 7638e6aabb64ffecd7e41704a580237cf6095446 Author: Mikael Urankar AuthorDate: 2023-07-28 07:04:38 +0000 Commit: Mikael Urankar CommitDate: 2023-07-28 08:13:06 +0000 lang/ocaml: Fix build on aarch64 SYSTEM_ARCH has to be set to arm64 The raw_spacetime_lib is only built on aarch64 Approved by: portmgr (build fix blanket) --- lang/ocaml/Makefile | 8 +++++++- lang/ocaml/pkg-plist | 10 ++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 93eb441d046e..d63fb1677eea 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -48,7 +48,7 @@ CONFIGURE_ARGS= --prefix="${PREFIX}" CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \ ASPP="${CC} -c" \ PARTIALLD="${LD} -r" -MAKE_ENV= SYSTEM_ARCH="${ARCH:C/powerpc.*/power/}" +MAKE_ENV= SYSTEM_ARCH="${ARCH:C/aarch64/arm64/:C/powerpc.*/power/}" OPTIONS_DEFINE= X11 THREADS DOCS EXAMPLES OPTIONS_DEFAULT=X11 THREADS @@ -74,6 +74,12 @@ DOCS_DISTFILES= ${DISTNAME:R}-refman-html.tar.gz:docs \ .include +.if ${ARCH} == aarch64 +PLIST_SUB+= RAWSPACETIMELIB=" " +.else +PLIST_SUB+= RAWSPACETIMELIB="@comment " +.endif + .if ${ARCH} == armv6 || ${ARCH} == armv7 CONFIGURE_ENV+= AS="${AS} ${ASFLAGS} -meabi=5" \ CC="${CC}" diff --git a/lang/ocaml/pkg-plist b/lang/ocaml/pkg-plist index 279c64a18e83..a1a148c53974 100644 --- a/lang/ocaml/pkg-plist +++ b/lang/ocaml/pkg-plist @@ -1440,6 +1440,7 @@ lib/ocaml/libcamlrund.a lib/ocaml/libcamlruni.a lib/ocaml/libcamlstr.a %%X11%%lib/ocaml/libgraphics.a +%%RAWSPACETIMELIB%%lib/ocaml/libraw_spacetime_lib.a %%THREADS%%lib/ocaml/libthreads.a %%THREADS%%lib/ocaml/libthreadsnat.a lib/ocaml/libunix.a @@ -1581,6 +1582,14 @@ lib/ocaml/queue.ml lib/ocaml/queue.mli lib/ocaml/random.ml lib/ocaml/random.mli +%%RAWSPACETIMELIB%%lib/ocaml/raw_spacetime_lib.a +%%RAWSPACETIMELIB%%lib/ocaml/raw_spacetime_lib.cma +%%RAWSPACETIMELIB%%lib/ocaml/raw_spacetime_lib.cmi +%%RAWSPACETIMELIB%%lib/ocaml/raw_spacetime_lib.cmti +%%RAWSPACETIMELIB%%lib/ocaml/raw_spacetime_lib.cmx +%%RAWSPACETIMELIB%%lib/ocaml/raw_spacetime_lib.cmxa +%%RAWSPACETIMELIB%%lib/ocaml/raw_spacetime_lib.cmxs +%%RAWSPACETIMELIB%%lib/ocaml/raw_spacetime_lib.mli lib/ocaml/result.ml lib/ocaml/result.mli lib/ocaml/scanf.ml @@ -1957,6 +1966,7 @@ lib/ocaml/stringLabels.ml lib/ocaml/stringLabels.mli lib/ocaml/stublibs/dllcamlstr.so %%X11%%lib/ocaml/stublibs/dllgraphics.so +%%RAWSPACETIMELIB%%lib/ocaml/stublibs/dllraw_spacetime_lib.so %%THREADS%%lib/ocaml/stublibs/dllthreads.so lib/ocaml/stublibs/dllunix.so lib/ocaml/stublibs/dllvmthreads.so