Tue Apr 25 18:30:50 2017 UTC ()
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


(bsiegert)
diff -r1.31 -r1.31.2.1 pkgsrc/devel/ocaml-findlib/Makefile
diff -r1.13 -r1.13.2.1 pkgsrc/devel/ocaml-findlib/PLIST
cvs diff -r1.31 -r1.31.2.1 pkgsrc/devel/ocaml-findlib/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/Makefile 2016/12/30 11:16:58 1.31
+++ pkgsrc/devel/ocaml-findlib/Makefile 2017/04/25 18:30:49 1.31.2.1
@@ -1,31 +1,38 @@ @@ -1,31 +1,38 @@
1# $NetBSD: Makefile,v 1.31 2016/12/30 11:16:58 jaapb Exp $ 1# $NetBSD: Makefile,v 1.31.2.1 2017/04/25 18:30:49 bsiegert Exp $
2 2
3DISTNAME= findlib-1.7.1 3DISTNAME= findlib-1.7.1
4PKGNAME= ocaml-${DISTNAME} 4PKGNAME= ocaml-${DISTNAME}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= http://download.camlcity.org/download/ 7MASTER_SITES= http://download.camlcity.org/download/
8 8
9MAINTAINER= jaapb@NetBSD.org 9MAINTAINER= jaapb@NetBSD.org
10HOMEPAGE= http://www.camlcity.org/ 10HOMEPAGE= http://www.camlcity.org/
11COMMENT= Library finder for OCaml 11COMMENT= Library finder for OCaml
12LICENSE= mit 12LICENSE= mit
13 13
14OCAML_FINDLIB_DIRS+= bigarray bytes compiler-libs dynlink findlib graphics \ 14OCAML_FINDLIB_DIRS+= bigarray bytes compiler-libs dynlink findlib graphics \
15 ocamldoc num-top num stdlib str threads unix 15 ocamldoc num-top num stdlib str threads unix
16 16
17.include "../../mk/ocaml.mk" 17.include "../../mk/ocaml.mk"
18 18
 19# spacetime profiling is only available for native code on 64bit platforms
 20PLIST_VARS+= 64bit
 21.if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \
 22 (defined(ABI) && ${ABI} == "64")
 23PLIST.64bit= yes
 24.endif
 25
19# Undeclared dependencies between different components 26# Undeclared dependencies between different components
20MAKE_JOBS_SAFE= no 27MAKE_JOBS_SAFE= no
21 28
22USE_TOOLS+= gmake m4 bash fgrep:run sh:run 29USE_TOOLS+= gmake m4 bash fgrep:run sh:run
23USE_PKGLOCALEDIR= yes 30USE_PKGLOCALEDIR= yes
24HAS_CONFIGURE= yes 31HAS_CONFIGURE= yes
25CONFIGURE_ARGS+= -bindir ${PREFIX}/bin 32CONFIGURE_ARGS+= -bindir ${PREFIX}/bin
26CONFIGURE_ARGS+= -mandir ${PREFIX}/${PKGMANDIR} 33CONFIGURE_ARGS+= -mandir ${PREFIX}/${PKGMANDIR}
27CONFIGURE_ARGS+= -config ${PKG_SYSCONFDIR}/ocamlfind.conf 34CONFIGURE_ARGS+= -config ${PKG_SYSCONFDIR}/ocamlfind.conf
28CONFIGURE_ARGS+= -sitelib ${PREFIX}/${OCAML_SITELIBDIR} 35CONFIGURE_ARGS+= -sitelib ${PREFIX}/${OCAML_SITELIBDIR}
29CONFIGURE_ARGS+= -no-camlp4 36CONFIGURE_ARGS+= -no-camlp4
30 37
31BUILD_TARGET= all 38BUILD_TARGET= all
cvs diff -r1.13 -r1.13.2.1 pkgsrc/devel/ocaml-findlib/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/PLIST 2016/12/30 11:16:58 1.13
+++ pkgsrc/devel/ocaml-findlib/PLIST 2017/04/25 18:30:49 1.13.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2016/12/30 11:16:58 jaapb Exp $ 1@comment $NetBSD: PLIST,v 1.13.2.1 2017/04/25 18:30:49 bsiegert Exp $
2bin/ocamlfind 2bin/ocamlfind
3${OCAML_SITELIB}/bigarray/META 3${OCAML_SITELIB}/bigarray/META
4${OCAML_SITELIB}/bytes/META 4${OCAML_SITELIB}/bytes/META
5${OCAML_SITELIB}/compiler-libs/META 5${OCAML_SITELIB}/compiler-libs/META
6${OCAML_SITELIB}/dynlink/META 6${OCAML_SITELIB}/dynlink/META
7${OCAML_SITELIB}/findlib/META 7${OCAML_SITELIB}/findlib/META
8${OCAML_SITELIB}/findlib/Makefile.config 8${OCAML_SITELIB}/findlib/Makefile.config
9${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.a 9${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.a
10${OCAML_SITELIB}/findlib/findlib.cma 10${OCAML_SITELIB}/findlib/findlib.cma
11${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxa 11${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxa
12${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxs 12${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxs
13${OCAML_SITELIB}/findlib/findlib.cmi 13${OCAML_SITELIB}/findlib/findlib.cmi
14${OCAML_SITELIB}/findlib/findlib.mli 14${OCAML_SITELIB}/findlib/findlib.mli
@@ -26,24 +26,24 @@ ${OCAML_SITELIB}/findlib/fl_metascanner. @@ -26,24 +26,24 @@ ${OCAML_SITELIB}/findlib/fl_metascanner.
26${OCAML_SITELIB}/findlib/fl_metascanner.mli 26${OCAML_SITELIB}/findlib/fl_metascanner.mli
27${OCAML_SITELIB}/findlib/fl_metatoken.cmi 27${OCAML_SITELIB}/findlib/fl_metatoken.cmi
28${OCAML_SITELIB}/findlib/fl_package_base.cmi 28${OCAML_SITELIB}/findlib/fl_package_base.cmi
29${OCAML_SITELIB}/findlib/fl_package_base.mli 29${OCAML_SITELIB}/findlib/fl_package_base.mli
30${OCAML_SITELIB}/findlib/topfind.cmi 30${OCAML_SITELIB}/findlib/topfind.cmi
31${OCAML_SITELIB}/findlib/topfind.mli 31${OCAML_SITELIB}/findlib/topfind.mli
32${OCAML_SITELIB}/graphics/META 32${OCAML_SITELIB}/graphics/META
33${OCAML_SITELIB}/ocamldoc/META 33${OCAML_SITELIB}/ocamldoc/META
34${OCAML_SITELIB}/num-top/META 34${OCAML_SITELIB}/num-top/META
35${OCAML_SITELIB}/num-top/num_top.cma 35${OCAML_SITELIB}/num-top/num_top.cma
36${OCAML_SITELIB}/num-top/num_top.cmi 36${OCAML_SITELIB}/num-top/num_top.cmi
37${OCAML_SITELIB}/num-top/num_top_printers.cmi 37${OCAML_SITELIB}/num-top/num_top_printers.cmi
38${OCAML_SITELIB}/num/META 38${OCAML_SITELIB}/num/META
39${OCAML_SITELIB}/raw_spacetime/META 39${PLIST.64bit}${OCAML_SITELIB}/raw_spacetime/META
40${OCAML_SITELIB}/stdlib/META 40${OCAML_SITELIB}/stdlib/META
41${OCAML_SITELIB}/str/META 41${OCAML_SITELIB}/str/META
42${OCAML_SITELIB}/threads/META 42${OCAML_SITELIB}/threads/META
43${OCAML_SITELIB}/unix/META 43${OCAML_SITELIB}/unix/META
44lib/ocaml/topfind 44lib/ocaml/topfind
45man/man1/ocamlfind.1 45man/man1/ocamlfind.1
46man/man5/META.5 46man/man5/META.5
47man/man5/findlib.conf.5 47man/man5/findlib.conf.5
48man/man5/site-lib.5 48man/man5/site-lib.5
49share/examples/ocaml-findlib/ocamlfind.conf 49share/examples/ocaml-findlib/ocamlfind.conf