diff options
author | is <is> | 2010-11-28 08:41:33 +0000 |
---|---|---|
committer | is <is> | 2010-11-28 08:41:33 +0000 |
commit | b78e6589334f73cf6fd10ac32fa17932e55cabdc (patch) | |
tree | 7001be1618910c5679f66c610c7c4a8e27579c1d | |
parent | 44e557ecac104043b6e6755465bcb128f3ec32f9 (diff) | |
download | pkgsrc-b78e6589334f73cf6fd10ac32fa17932e55cabdc.tar.gz |
Make this package work again on architectures where we don't compile
natively (that is, only to byte-code).
This consists of two parts:
a) a patch to ocamldoc/Makefile to make it create the man pages using
the interpreted ocamldoc - this exists for both types of architectures,
so is safe. (This will be sent up-stream).
b) move a common shared library file to the common PLIST, and a lot of
files (natively compiled versions of the ML modules and natively compiled
versions of a few binaries) to PLIST.opt.
This has been build-tested on i386 (cross-compiled from amd64) and on
arm. unison builds and works.
"make test" shows the same amount of passed and failed tests (mostly
non-found libraries) as before; but this needs more investigation.
An additional issue to solve (with upstream) is that there's no easy way
to run the part of the test suite that would work on byte-code-only
architectures.
-rw-r--r-- | lang/ocaml/Makefile.common | 3 | ||||
-rw-r--r-- | lang/ocaml/PLIST | 42 | ||||
-rw-r--r-- | lang/ocaml/PLIST.opt | 42 | ||||
-rw-r--r-- | lang/ocaml/distinfo | 4 | ||||
-rw-r--r-- | lang/ocaml/patches/patch-aw | 30 |
5 files changed, 73 insertions, 48 deletions
diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common index 068207d9355..a922056e8b7 100644 --- a/lang/ocaml/Makefile.common +++ b/lang/ocaml/Makefile.common @@ -1,8 +1,9 @@ -# $NetBSD: Makefile.common,v 1.26 2010/08/19 08:06:53 asau Exp $ +# $NetBSD: Makefile.common,v 1.27 2010/11/28 08:41:33 is Exp $ # used by x11/labltk/Makefile # used by x11/ocaml-graphics/Makefile DISTNAME= ocaml-3.12.0 +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-3.12/ EXTRACT_SUFX= .tar.bz2 diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST index 2d38f616287..003a8047ef6 100644 --- a/lang/ocaml/PLIST +++ b/lang/ocaml/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2010/08/19 08:06:53 asau Exp $ +@comment $NetBSD: PLIST,v 1.23 2010/11/28 08:41:33 is Exp $ bin/camlp4 bin/camlp4boot bin/camlp4o @@ -12,7 +12,6 @@ bin/mkcamlp4 bin/ocaml bin/ocamlbuild bin/ocamlbuild.byte -bin/ocamlbuild.native bin/ocamlc bin/ocamlcp bin/ocamldebug @@ -78,104 +77,71 @@ lib/ocaml/camlinternalOO.mli lib/ocaml/camlp4/Camlp4.cmi lib/ocaml/camlp4/Camlp4Bin.cmi lib/ocaml/camlp4/Camlp4Bin.cmo -lib/ocaml/camlp4/Camlp4Bin.o lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmi lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.o lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmi lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.o lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmi lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.o lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmi lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.o lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmi lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.o lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmi lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.o lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmi lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.o lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmi lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmi lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmi lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmi lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmi lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmi lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmi lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmi lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmi lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmi lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmi lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmi lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmi lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmi lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.o lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmi lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.o lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmi lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.o lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmi lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.o lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmi lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.o lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmi lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.o lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmi lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.o lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmi lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.o lib/ocaml/camlp4/Camlp4Top.cmi lib/ocaml/camlp4/Camlp4Top.cmo lib/ocaml/camlp4/Camlp4Top/Rprint.cmi lib/ocaml/camlp4/Camlp4Top/Rprint.cmo -lib/ocaml/camlp4/Camlp4Top/Rprint.o lib/ocaml/camlp4/Camlp4Top/Top.cmi lib/ocaml/camlp4/Camlp4Top/Top.cmo -lib/ocaml/camlp4/Camlp4Top/Top.o lib/ocaml/camlp4/Camlp4_config.cmi lib/ocaml/camlp4/Camlp4_import.cmi -lib/ocaml/camlp4/camlp4fulllib.a lib/ocaml/camlp4/camlp4fulllib.cma -lib/ocaml/camlp4/camlp4lib.a lib/ocaml/camlp4/camlp4lib.cma lib/ocaml/camlp4/camlp4o.cma lib/ocaml/camlp4/camlp4of.cma @@ -183,7 +149,6 @@ lib/ocaml/camlp4/camlp4oof.cma lib/ocaml/camlp4/camlp4orf.cma lib/ocaml/camlp4/camlp4prof.cmi lib/ocaml/camlp4/camlp4prof.cmo -lib/ocaml/camlp4/camlp4prof.o lib/ocaml/camlp4/camlp4r.cma lib/ocaml/camlp4/camlp4rf.cma lib/ocaml/char.cmi @@ -235,6 +200,7 @@ lib/ocaml/lexing.ml lib/ocaml/lexing.mli lib/ocaml/libbigarray.a lib/ocaml/libcamlrun.a +lib/ocaml/libcamlrun_shared.so lib/ocaml/libcamlstr.a lib/ocaml/libmldbm.a lib/ocaml/libnums.a @@ -269,16 +235,12 @@ lib/ocaml/obj.ml lib/ocaml/obj.mli lib/ocaml/objinfo_helper lib/ocaml/ocamlbuild/ocamlbuild.cmo -lib/ocaml/ocamlbuild/ocamlbuild.o lib/ocaml/ocamlbuild/ocamlbuild_executor.cmi lib/ocaml/ocamlbuild/ocamlbuild_executor.cmo -lib/ocaml/ocamlbuild/ocamlbuild_executor.o lib/ocaml/ocamlbuild/ocamlbuild_pack.cmi lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmi lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmi lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmo -lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o -lib/ocaml/ocamlbuild/ocamlbuildlib.a lib/ocaml/ocamlbuild/ocamlbuildlib.cma lib/ocaml/ocamldoc/ocamldoc.hva lib/ocaml/ocamldoc/odoc.cmi diff --git a/lang/ocaml/PLIST.opt b/lang/ocaml/PLIST.opt index 31b5b913fef..311293b0f09 100644 --- a/lang/ocaml/PLIST.opt +++ b/lang/ocaml/PLIST.opt @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST.opt,v 1.16 2010/08/19 08:06:53 asau Exp $ +@comment $NetBSD: PLIST.opt,v 1.17 2010/11/28 08:41:33 is Exp $ bin/camlp4o.opt bin/camlp4of.opt bin/camlp4oof.opt bin/camlp4orf.opt bin/camlp4r.opt bin/camlp4rf.opt +bin/ocamlbuild.native bin/ocamlc.opt bin/ocamldep.opt bin/ocamldoc.opt @@ -77,7 +78,6 @@ lib/ocaml/lazy.cmx lib/ocaml/lexing.cmx lib/ocaml/libasmrun.a lib/ocaml/libasmrunp.a -lib/ocaml/libcamlrun_shared.so lib/ocaml/libthreadsnat.a lib/ocaml/list.cmx lib/ocaml/listLabels.cmx @@ -137,3 +137,41 @@ lib/ocaml/unix.cmx lib/ocaml/unix.cmxa lib/ocaml/unixLabels.cmx lib/ocaml/weak.cmx +lib/ocaml/camlp4/Camlp4Bin.o +lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.o +lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.o +lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.o +lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.o +lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.o +lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.o +lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.o +lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.o +lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.o +lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.o +lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.o +lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.o +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.o +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.o +lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.o +lib/ocaml/camlp4/Camlp4Top/Rprint.o +lib/ocaml/camlp4/Camlp4Top/Top.o +lib/ocaml/camlp4/camlp4lib.a +lib/ocaml/camlp4/camlp4fulllib.a +lib/ocaml/camlp4/camlp4prof.o +lib/ocaml/ocamlbuild/ocamlbuild.o +lib/ocaml/ocamlbuild/ocamlbuild_executor.o +lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o +lib/ocaml/ocamlbuild/ocamlbuildlib.a diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 3b8dc01f9f6..41cb29d9ad9 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.51 2010/08/19 08:06:53 asau Exp $ +$NetBSD: distinfo,v 1.52 2010/11/28 08:41:33 is Exp $ SHA1 (ocaml-3.12.0.tar.bz2) = 33ebbfb1115806f117808f37e40d206c8994943d RMD160 (ocaml-3.12.0.tar.bz2) = 3d10d5f7431d8200688fa74122e7ed528126a0fa @@ -14,7 +14,7 @@ SHA1 (patch-an) = 8fb8efecd2b3f0ec6f913a0840f4cfebcbb6161e SHA1 (patch-at) = b8ca7e6fa643b4dfbd165a5a1187f96834823617 SHA1 (patch-au) = 1e36bcdf39d40e781273ea51df213db05ff46c89 SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2 -SHA1 (patch-aw) = 5838ca13ba0f5d9328b9bb2135604f72e7d8b87b +SHA1 (patch-aw) = ce7b09f19f9f086b65b5036b6684c5243e990b8c SHA1 (patch-ax) = d46667e6874aa8aa656f6fb15ddcedc493d7bdf1 SHA1 (patch-ay) = 702dd7d24ac94851bbb0f2c3f22e2141345ee8ea SHA1 (patch-az) = 9b9e1cfa8972e6bea9563d4d12866d567fdce668 diff --git a/lang/ocaml/patches/patch-aw b/lang/ocaml/patches/patch-aw index aaf8c1cca9d..09b5d3f1b95 100644 --- a/lang/ocaml/patches/patch-aw +++ b/lang/ocaml/patches/patch-aw @@ -1,8 +1,32 @@ -$NetBSD: patch-aw,v 1.7 2008/01/23 20:42:26 adam Exp $ +$NetBSD: patch-aw,v 1.8 2010/11/28 08:41:33 is Exp $ ---- ocamldoc/Makefile.orig 2007-09-02 08:28:20.000000000 +0200 +--- ocamldoc/Makefile.orig 2010-06-16 11:38:22.000000000 +0000 +++ ocamldoc/Makefile -@@ -258,24 +258,24 @@ odoc_see_lexer.ml: odoc_see_lexer.mll +@@ -31,7 +31,7 @@ OCAMLPP=-pp './remove_DEBUG' + MKDIR=mkdir -p + CP=cp -f + OCAMLDOC=ocamldoc +-OCAMLDOC_RUN=./ocamldoc.opt #sh ./runocamldoc $(SUPPORTS_SHARED_LIBRARIES) ++OCAMLDOC_RUN=sh ./runocamldoc $(SUPPORTS_SHARED_LIBRARIES) + OCAMLDOC_OPT=$(OCAMLDOC).opt + OCAMLDOC_LIBCMA=odoc_info.cma + OCAMLDOC_LIBCMI=odoc_info.cmi +@@ -189,12 +189,13 @@ STDLIB_MLIS=../stdlib/*.mli \ + ../otherlibs/num/num.mli + + all: exe lib ++ $(MAKE) manpages + + exe: $(OCAMLDOC) + lib: $(OCAMLDOC_LIBCMA) $(OCAMLDOC_LIBCMI) $(ODOC_TEST) + + opt.opt: exeopt libopt +- $(MAKE) manpages ++ + exeopt: $(OCAMLDOC_OPT) + libopt: $(OCAMLDOC_LIBCMXA) $(OCAMLDOC_LIBCMI) + debug: +@@ -259,24 +260,24 @@ odoc_see_lexer.ml: odoc_see_lexer.mll # Installation targets ###################### install: dummy |