diff options
| author | maya <maya> | 2017-04-24 21:47:47 +0000 |
|---|---|---|
| committer | maya <maya> | 2017-04-24 21:47:47 +0000 |
| commit | 8e2c002fca4f622c443ce16d1cdc120f078050c7 (patch) | |
| tree | 7e3f2592aace133ce4d105998db414316ced8850 /devel | |
| parent | 781d53618069eecaba8690f26d9877ffa7e51417 (diff) | |
| download | pkgsrc-8e2c002fca4f622c443ce16d1cdc120f078050c7.tar.gz | |
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 (limited to 'devel')
| -rw-r--r-- | devel/ocaml-findlib/Makefile | 9 | ||||
| -rw-r--r-- | devel/ocaml-findlib/PLIST | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile index 5d8a8198aeb..503ebe7bd84 100644 --- a/devel/ocaml-findlib/Makefile +++ b/devel/ocaml-findlib/Makefile @@ -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 compiler-libs dynlink findlib graphics \ .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 --git a/devel/ocaml-findlib/PLIST b/devel/ocaml-findlib/PLIST index 0dbfc18d10c..def3b7e59bc 100644 --- a/devel/ocaml-findlib/PLIST +++ b/devel/ocaml-findlib/PLIST @@ -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 |