Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 3AAE57A1B9 for ; Mon, 24 Apr 2017 21:47:49 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id A543684DB5; Mon, 24 Apr 2017 21:47:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 357E884DB3 for ; Mon, 24 Apr 2017 21:47:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 3qxkN7JtBEUc for ; Mon, 24 Apr 2017 21:47:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B9BDA84D84 for ; Mon, 24 Apr 2017 21:47:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B0C16FBE4; Mon, 24 Apr 2017 21:47:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1493070467159000" MIME-Version: 1.0 Date: Mon, 24 Apr 2017 21:47:47 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/devel/ocaml-findlib To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20170424214747.B0C16FBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1493070467159000 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Mon Apr 24 21:47:47 UTC 2017 Modified Files: pkgsrc/devel/ocaml-findlib: Makefile PLIST Log Message: ocaml-findlib: make PLIST entry for 64bit platforms only spacetime profiling only works on 64bit according to ocaml's configure script blind fix for i386 based on build fail logs, logic taken from nss To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/ocaml-findlib/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/ocaml-findlib/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1493070467159000 Content-Disposition: inline Content-Length: 1703 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/ocaml-findlib/Makefile diff -u pkgsrc/devel/ocaml-findlib/Makefile:1.31 pkgsrc/devel/ocaml-findlib/Makefile:1.32 --- pkgsrc/devel/ocaml-findlib/Makefile:1.31 Fri Dec 30 11:16:58 2016 +++ pkgsrc/devel/ocaml-findlib/Makefile Mon Apr 24 21:47:47 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2016/12/30 11:16:58 jaapb Exp $ +# $NetBSD: Makefile,v 1.32 2017/04/24 21:47:47 maya Exp $ DISTNAME= findlib-1.7.1 PKGNAME= ocaml-${DISTNAME} @@ -16,6 +16,13 @@ OCAML_FINDLIB_DIRS+= bigarray bytes comp .include "../../mk/ocaml.mk" +# spacetime profiling is only available for native code on 64bit platforms +PLIST_VARS+= 64bit +.if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \ + (defined(ABI) && ${ABI} == "64") +PLIST.64bit= yes +.endif + # Undeclared dependencies between different components MAKE_JOBS_SAFE= no Index: pkgsrc/devel/ocaml-findlib/PLIST diff -u pkgsrc/devel/ocaml-findlib/PLIST:1.13 pkgsrc/devel/ocaml-findlib/PLIST:1.14 --- pkgsrc/devel/ocaml-findlib/PLIST:1.13 Fri Dec 30 11:16:58 2016 +++ pkgsrc/devel/ocaml-findlib/PLIST Mon Apr 24 21:47:47 2017 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2016/12/30 11:16:58 jaapb Exp $ +@comment $NetBSD: PLIST,v 1.14 2017/04/24 21:47:47 maya Exp $ bin/ocamlfind ${OCAML_SITELIB}/bigarray/META ${OCAML_SITELIB}/bytes/META @@ -36,7 +36,7 @@ ${OCAML_SITELIB}/num-top/num_top.cma ${OCAML_SITELIB}/num-top/num_top.cmi ${OCAML_SITELIB}/num-top/num_top_printers.cmi ${OCAML_SITELIB}/num/META -${OCAML_SITELIB}/raw_spacetime/META +${PLIST.64bit}${OCAML_SITELIB}/raw_spacetime/META ${OCAML_SITELIB}/stdlib/META ${OCAML_SITELIB}/str/META ${OCAML_SITELIB}/threads/META --_----------=_1493070467159000--