diff options
author | jaapb <jaapb> | 2013-02-18 16:29:28 +0000 |
---|---|---|
committer | jaapb <jaapb> | 2013-02-18 16:29:28 +0000 |
commit | ddb4c7a765983e08878bf8d15227e14e7e19ad51 (patch) | |
tree | c762d8b31b8cb1259a84c2ebffc9acb4121d83da | |
parent | c7c2d646d64688afc0f02bb6343f69a3097abf04 (diff) | |
download | pkgsrc-ddb4c7a765983e08878bf8d15227e14e7e19ad51.tar.gz |
Removed the bytecomp_bytelink.ml patch, as suggested by degroote@ - it
isn't needed any longer and breaks some compilations. Also, changed some
patches to use the correct BSD_INSTALL variables for shared libraries, and
after discussion with adam@, I am taking over maintainership of this
package.
-rw-r--r-- | lang/ocaml/Makefile.common | 5 | ||||
-rw-r--r-- | lang/ocaml/distinfo | 9 | ||||
-rw-r--r-- | lang/ocaml/patches/patch-bytecomp_bytelink.ml | 23 | ||||
-rw-r--r-- | lang/ocaml/patches/patch-otherlibs_Makefile.shared | 4 | ||||
-rw-r--r-- | lang/ocaml/patches/patch-otherlibs_systhreads_Makefile | 4 | ||||
-rw-r--r-- | lang/ocaml/patches/patch-otherlibs_threads_Makefile | 8 |
6 files changed, 15 insertions, 38 deletions
diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common index 81b0b28f01d..a4224f66366 100644 --- a/lang/ocaml/Makefile.common +++ b/lang/ocaml/Makefile.common @@ -1,13 +1,14 @@ -# $NetBSD: Makefile.common,v 1.34 2012/10/08 15:05:32 jaapb Exp $ +# $NetBSD: Makefile.common,v 1.35 2013/02/18 16:29:28 jaapb Exp $ # used by x11/labltk/Makefile # used by x11/ocaml-graphics/Makefile DISTNAME= ocaml-4.00.1 +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.00/ EXTRACT_SUFX= .tar.bz2 -MAINTAINER= adam@NetBSD.org +MAINTAINER= jaapb@NetBSD.org HOMEPAGE= http://caml.inria.fr/ocaml/ COMMENT= The latest implementation of the Caml dialect of ML LICENSE= gnu-gpl-v2 diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 1a364fe7e2e..393925bb361 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.68 2013/01/25 14:49:38 jperkin Exp $ +$NetBSD: distinfo,v 1.69 2013/02/18 16:29:28 jaapb Exp $ SHA1 (ocaml-4.00.1.tar.bz2) = 10b8a4d0b88d20b003e3dd719f2ac9434e6a1042 RMD160 (ocaml-4.00.1.tar.bz2) = db28f57b463af90650b877af0baf44eb226b0a79 @@ -8,14 +8,13 @@ SHA1 (patch-asmcomp_power_emit.mlp) = 726e09e4902b96f4790c7a8093eb245dd7028bf4 SHA1 (patch-asmrun_Makefile) = 5d49c710937c21df9974ad07f255992ef0f0dac8 SHA1 (patch-asmrun_power-bsd.S) = bd52898dde14adc1dbf9cd85a7f8af4d77218e6f SHA1 (patch-asmrun_signals_osdep.h) = cc7131ef020563ae28c1fddbe8fe634174f73826 -SHA1 (patch-bytecomp_bytelink.ml) = 051044bc6f534d3f197d40e6d527e5224a1f166a SHA1 (patch-byterun_Makefile) = 9681ce78c78879d29d9c58f35278a14e6cb18e96 SHA1 (patch-camlp4_man_Makefile) = c3a5dc09a2cc15d969c4e074be7da98a979f7db4 SHA1 (patch-configure) = 042784bf8d3561aafe62259ea9a0ed5f392b5c95 SHA1 (patch-debugger_Makefile.shared) = 583fa88caf965164aa3b638dda4c2a6e8878bdf9 SHA1 (patch-man_Makefile) = 3f52dd1fcbde53399852a6490d5f27fc7c1c98e5 SHA1 (patch-ocamldoc_Makefile) = d09c5f779dc1da9317d1c6e5eb4b251a9af45562 -SHA1 (patch-otherlibs_Makefile.shared) = f3865f30b76cc903f9c0a5d1d9d5edfb7001e139 +SHA1 (patch-otherlibs_Makefile.shared) = 2264e22c3e0079b31ff498ddb387358fc3a503cc SHA1 (patch-otherlibs_dynlink_Makefile) = b045aa0d16dcc7327a37482189168dcab6976a08 SHA1 (patch-otherlibs_labltk_browser_Makefile.shared) = 5558d385f962195563ca7dd68a238a97b5ffb8a6 SHA1 (patch-otherlibs_labltk_camltk_Makefile) = eebfab73d526e24f52b6cc4fc09bc9e0a7cb7193 @@ -25,8 +24,8 @@ SHA1 (patch-otherlibs_labltk_jpf_Makefile) = 2f768f78ed4c723c567f1a4c0ac3eff00a7 SHA1 (patch-otherlibs_labltk_labltk_Makefile) = 31c496143255c31f1e3474fbc775f4bd7689a642 SHA1 (patch-otherlibs_labltk_lib_Makefile) = 20bb9f5fffc3271d45025bfd5b033173e8cf5319 SHA1 (patch-otherlibs_labltk_support_Makefile) = 9bf06605324e167fb09f4f943ebc147c54868b67 -SHA1 (patch-otherlibs_systhreads_Makefile) = 85c8816059d6be3dd4b437cbd3bccf0d16d3a73a -SHA1 (patch-otherlibs_threads_Makefile) = 16e18f7992059a66da001b5233aa8236cde1a8c9 +SHA1 (patch-otherlibs_systhreads_Makefile) = 89db3ff91128c4773edf28d2c91f3c4923472e86 +SHA1 (patch-otherlibs_threads_Makefile) = 803952c7ee2b3f9eeddf473d29515fa102ee8a82 SHA1 (patch-stdlib_Makefile) = 85c89d6b9caf08056407da3564e7d2f5353b93a0 SHA1 (patch-stdlib_Makefile.shared) = 42dafb10f88b501982fb0d65c380f1fa61740f54 SHA1 (patch-tools_Makefile.shared) = 8c23fc72c627e2315451e6223946e9257c3e341d diff --git a/lang/ocaml/patches/patch-bytecomp_bytelink.ml b/lang/ocaml/patches/patch-bytecomp_bytelink.ml deleted file mode 100644 index 4db5384d92e..00000000000 --- a/lang/ocaml/patches/patch-bytecomp_bytelink.ml +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-bytecomp_bytelink.ml,v 1.2 2012/10/08 15:05:33 jaapb Exp $ - -Honour EXTRA_RT_LIBS ---- bytecomp/bytelink.ml.orig 2012-04-16 15:27:42.000000000 +0000 -+++ bytecomp/bytelink.ml -@@ -475,7 +475,7 @@ let link_bytecode_as_c ppf tolink outfil - (* Build a custom runtime *) - - let build_custom_runtime prim_name exec_name = -- let runtime_lib = "-lcamlrun" ^ !Clflags.runtime_variant in -+ let runtime_lib = "-lcamlrun @EXTRA_RT_LIBS@" ^ !Clflags.runtime_variant in - Ccomp.call_linker Ccomp.Exe exec_name - ([prim_name] @ List.rev !Clflags.ccobjs @ [runtime_lib]) - (Clflags.std_include_flag "-I" ^ " " ^ Config.bytecomp_c_libraries) -@@ -560,7 +560,7 @@ let link ppf objfiles output_name = - if not (Filename.check_suffix output_name Config.ext_obj) then begin - temps := obj_file :: !temps; - if not ( -- let runtime_lib = "-lcamlrun" ^ !Clflags.runtime_variant in -+ let runtime_lib = "-lcamlrun @EXTRA_RT_LIBS@" ^ !Clflags.runtime_variant in - Ccomp.call_linker Ccomp.MainDll output_name - ([obj_file] @ List.rev !Clflags.ccobjs @ [runtime_lib]) - Config.bytecomp_c_libraries diff --git a/lang/ocaml/patches/patch-otherlibs_Makefile.shared b/lang/ocaml/patches/patch-otherlibs_Makefile.shared index 47669285915..dc196f025f1 100644 --- a/lang/ocaml/patches/patch-otherlibs_Makefile.shared +++ b/lang/ocaml/patches/patch-otherlibs_Makefile.shared @@ -1,4 +1,4 @@ -$NetBSD: patch-otherlibs_Makefile.shared,v 1.1 2012/10/08 15:05:33 jaapb Exp $ +$NetBSD: patch-otherlibs_Makefile.shared,v 1.2 2013/02/18 16:29:28 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp --- otherlibs/Makefile.shared.orig 2011-07-27 14:17:02.000000000 +0000 @@ -9,7 +9,7 @@ Use BSD_INSTALL_* instead of mkdir and cp if test -f dll$(CLIBNAME)$(EXT_DLL); then \ - cp dll$(CLIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi - cp lib$(CLIBNAME).$(A) $(LIBDIR)/ -+ $(BSD_INSTALL_DATA) dll$(CLIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi ++ $(BSD_INSTALL_LIB) dll$(CLIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi + $(BSD_INSTALL_DATA) lib$(CLIBNAME).$(A) $(LIBDIR)/ cd $(LIBDIR); $(RANLIB) lib$(CLIBNAME).$(A) - cp $(LIBNAME).cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR)/ diff --git a/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile b/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile index e3e1f97f5e3..04e596aef2b 100644 --- a/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile +++ b/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.1 2012/10/08 15:05:33 jaapb Exp $ +$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.2 2013/02/18 16:29:28 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp --- otherlibs/systhreads/Makefile.orig 2012-06-08 11:35:37.000000000 +0000 @@ -9,7 +9,7 @@ Use BSD_INSTALL_* instead of mkdir and cp install: - if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi - cp libthreads.a $(LIBDIR)/libthreads.a -+ if test -f dllthreads.so; then $(BSD_INSTALL_DATA) dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi ++ if test -f dllthreads.so; then $(BSD_INSTALL_LIB) dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi + $(BSD_INSTALL_DATA) libthreads.a $(LIBDIR)/libthreads.a cd $(LIBDIR); $(RANLIB) libthreads.a - if test -d $(LIBDIR)/threads; then :; else mkdir $(LIBDIR)/threads; fi diff --git a/lang/ocaml/patches/patch-otherlibs_threads_Makefile b/lang/ocaml/patches/patch-otherlibs_threads_Makefile index b22a4700738..2bf0b0cbd40 100644 --- a/lang/ocaml/patches/patch-otherlibs_threads_Makefile +++ b/lang/ocaml/patches/patch-otherlibs_threads_Makefile @@ -1,16 +1,16 @@ -$NetBSD: patch-otherlibs_threads_Makefile,v 1.1 2012/10/08 15:05:33 jaapb Exp $ +$NetBSD: patch-otherlibs_threads_Makefile,v 1.2 2013/02/18 16:29:28 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp ---- otherlibs/threads/Makefile.orig 2012-04-19 13:12:23.000000000 +0000 +--- otherlibs/threads/Makefile.orig 2012-08-21 04:39:34.000000000 +0000 +++ otherlibs/threads/Makefile -@@ -97,12 +97,12 @@ clean: partialclean +@@ -98,12 +98,12 @@ clean: partialclean rm -f pervasives.mli marshal.mli unix.mli install: - if test -f dllvmthreads.so; then cp dllvmthreads.so $(STUBLIBDIR)/.; fi - mkdir -p $(LIBDIR)/vmthreads - cp libvmthreads.a $(LIBDIR)/vmthreads/libvmthreads.a -+ if test -f dllvmthreads.so; then $(BSD_INSTALL_DATA) dllvmthreads.so $(STUBLIBDIR)/.; fi ++ if test -f dllvmthreads.so; then $(BSD_INSTALL_LIB) dllvmthreads.so $(STUBLIBDIR)/.; fi + $(BSD_INSTALL_DATA_DIR) -p $(LIBDIR)/vmthreads + $(BSD_INSTALL_DATA) libvmthreads.a $(LIBDIR)/vmthreads/libvmthreads.a cd $(LIBDIR)/vmthreads; $(RANLIB) libvmthreads.a |