CVS commit: pkgsrc/devel/ocaml-findlib

["Maya Rashish" <maya%netbsd.org@localhost>]

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.

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