[pkgsrc/pkgsrc-2017Q1]: pkgsrc/devel/ocaml-findlib Pullup ticket #5364 - requ...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2c6af169af42
branches:  pkgsrc-2017Q1
changeset: 360301:2c6af169af42
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Tue Apr 25 18:30:49 2017 +0000

description:
Pullup ticket #5364 - requested by sevan
devel/ocaml-findlib: build fix

Revisions pulled up:
- devel/ocaml-findlib/Makefile                                  1.32
- devel/ocaml-findlib/PLIST                                     1.14

---
   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

diffstat:

 devel/ocaml-findlib/Makefile |  9 ++++++++-
 devel/ocaml-findlib/PLIST    |  4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 505dccb5d74f -r 2c6af169af42 devel/ocaml-findlib/Makefile
--- a/devel/ocaml-findlib/Makefile      Tue Apr 25 18:29:40 2017 +0000
+++ b/devel/ocaml-findlib/Makefile      Tue Apr 25 18:30:49 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2016/12/30 11:16:58 jaapb Exp $
+# $NetBSD: Makefile,v 1.31.2.1 2017/04/25 18:30:49 bsiegert Exp $
 
 DISTNAME=              findlib-1.7.1
 PKGNAME=               ocaml-${DISTNAME}
@@ -16,6 +16,13 @@
 
 .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
 
diff -r 505dccb5d74f -r 2c6af169af42 devel/ocaml-findlib/PLIST
--- a/devel/ocaml-findlib/PLIST Tue Apr 25 18:29:40 2017 +0000
+++ b/devel/ocaml-findlib/PLIST Tue Apr 25 18:30:49 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2016/12/30 11:16:58 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.13.2.1 2017/04/25 18:30:49 bsiegert Exp $
 bin/ocamlfind
 ${OCAML_SITELIB}/bigarray/META
 ${OCAML_SITELIB}/bytes/META
@@ -36,7 +36,7 @@
 ${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