From ee4657b57646887f84237d2627004d503be32fb0 Mon Sep 17 00:00:00 2001 From: Gabriel Scherer Date: Sat, 8 Sep 2018 17:47:39 +0200 Subject: [PATCH 1/2] ocamlbuild.0.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OCamlbuild 0.13.0 contains new features (`ppopt(..)` and `ppxopt(...)` flags, ocamlbuild options) and bugfixes (to pack production, for 4.08+dev support). - ocaml/ocamlbuild#45, ocaml/ocamlbuild#190: add ppopt(arg) and ppxopt(package,arg) when -use-ocamlfind (Gabriel Scherer, review by whitequark, request by Gabriel Scherer, Gabriel Radanne and Pavel Argentov) - ocaml/ocamlbuild#268, ocaml/ocamlbuild#269: add flag support for some ocamlmklib options: custom, debug, failsafe, linkall, ccopt(..), cclib(..), rpath(..), ldopt(..) (Gabriel Scherer, report by Hannes Mehnert, review by whitequark) * ocaml/ocamlbuild#272: add the "link" tag to "pack" actions Instead of a separate category, "pack" is now another form of linking like "program", "library", "toplevel" and "output_obj". This fixes the issue that package(...) tags where not passed at pack-production time, spotted by Jérémie Dimino. More generally, this extends the meaning of all "link" flags to "pack", which seems to be the correct behavior for all the rules we inspected. (Gabriel Scherer, original issue diagnosis by Jérémie Dimino) - ocaml/ocamlbuild#278: typo fixes in the manual (Xinzhe Yang) - ocaml/ocamlbuild#282: fix compilation with trunk OCaml (4.08+dev) (Xavier Clerc and Nandor Licker) --- packages/ocamlbuild/ocamlbuild.0.13.0/descr | 1 + packages/ocamlbuild/ocamlbuild.0.13.0/opam | 28 +++++++++++++++++++++ packages/ocamlbuild/ocamlbuild.0.13.0/url | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 packages/ocamlbuild/ocamlbuild.0.13.0/descr create mode 100644 packages/ocamlbuild/ocamlbuild.0.13.0/opam create mode 100644 packages/ocamlbuild/ocamlbuild.0.13.0/url diff --git a/packages/ocamlbuild/ocamlbuild.0.13.0/descr b/packages/ocamlbuild/ocamlbuild.0.13.0/descr new file mode 100644 index 00000000000..11c4f44559d --- /dev/null +++ b/packages/ocamlbuild/ocamlbuild.0.13.0/descr @@ -0,0 +1 @@ +OCamlbuild is a build system with builtin rules to easily build most OCaml projects. diff --git a/packages/ocamlbuild/ocamlbuild.0.13.0/opam b/packages/ocamlbuild/ocamlbuild.0.13.0/opam new file mode 100644 index 00000000000..2b06581248d --- /dev/null +++ b/packages/ocamlbuild/ocamlbuild.0.13.0/opam @@ -0,0 +1,28 @@ +opam-version: "1.2" +maintainer: "Gabriel Scherer " +authors: ["Nicolas Pouillard" "Berke Durak"] +homepage: "https://github.com/ocaml/ocamlbuild/" +bug-reports: "https://github.com/ocaml/ocamlbuild/issues" +license: "LGPL-2 with OCaml linking exception" +doc: "https://github.com/ocaml/ocamlbuild/blob/master/manual/manual.adoc" +dev-repo: "https://github.com/ocaml/ocamlbuild.git" +build: [ + [ + make + "-f" + "configure.make" + "all" + "OCAMLBUILD_PREFIX=%{prefix}%" + "OCAMLBUILD_BINDIR=%{bin}%" + "OCAMLBUILD_LIBDIR=%{lib}%" + "OCAMLBUILD_MANDIR=%{man}%" + "OCAML_NATIVE=%{ocaml-native}%" + "OCAML_NATIVE_TOOLS=%{ocaml-native}%" + ] + [make "check-if-preinstalled" "all" "opam-install"] +] +conflicts: [ + "base-ocamlbuild" + "ocamlfind" {< "1.6.2"} +] +available: [ocaml-version >= "4.03"] diff --git a/packages/ocamlbuild/ocamlbuild.0.13.0/url b/packages/ocamlbuild/ocamlbuild.0.13.0/url new file mode 100644 index 00000000000..d34a1c4cc04 --- /dev/null +++ b/packages/ocamlbuild/ocamlbuild.0.13.0/url @@ -0,0 +1,2 @@ +http: "https://github.com/ocaml/ocamlbuild/archive/0.13.0.tar.gz" +checksum: "c3358d47746c7ca0c853b5c3ec9db2e0" From 4afa59de9e4c3f789832ff89e94be63f4da705c9 Mon Sep 17 00:00:00 2001 From: Gabriel Scherer Date: Sat, 15 Sep 2018 01:39:42 +0200 Subject: [PATCH 2/2] ocamlbuild 0.13.1 (hides 0.13.0) This bugfix release attempts to fix a regression due to the change in "pack" handling in 0.13.0. It is not clear whether the regression should be considered a bug in 0.13.0 or an incorrect _tags file in the broken package, but we prefer to fix it anyway. - ocaml/ocamlbuild#287: change "linkpkg" flag definition to not apply in the new "pack"++"link" mode introduced by ocaml/ocamlbuild#272. This avoids a build failure in webidl.1.4 and possibly other packages using "true: linkpkg". (Gabriel Scherer, report by Andreas Hauptmann) --- packages/ocamlbuild/ocamlbuild.0.13.0/url | 2 -- .../ocamlbuild/{ocamlbuild.0.13.0 => ocamlbuild.0.13.1}/descr | 0 .../ocamlbuild/{ocamlbuild.0.13.0 => ocamlbuild.0.13.1}/opam | 0 packages/ocamlbuild/ocamlbuild.0.13.1/url | 2 ++ 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 packages/ocamlbuild/ocamlbuild.0.13.0/url rename packages/ocamlbuild/{ocamlbuild.0.13.0 => ocamlbuild.0.13.1}/descr (100%) rename packages/ocamlbuild/{ocamlbuild.0.13.0 => ocamlbuild.0.13.1}/opam (100%) create mode 100644 packages/ocamlbuild/ocamlbuild.0.13.1/url diff --git a/packages/ocamlbuild/ocamlbuild.0.13.0/url b/packages/ocamlbuild/ocamlbuild.0.13.0/url deleted file mode 100644 index d34a1c4cc04..00000000000 --- a/packages/ocamlbuild/ocamlbuild.0.13.0/url +++ /dev/null @@ -1,2 +0,0 @@ -http: "https://github.com/ocaml/ocamlbuild/archive/0.13.0.tar.gz" -checksum: "c3358d47746c7ca0c853b5c3ec9db2e0" diff --git a/packages/ocamlbuild/ocamlbuild.0.13.0/descr b/packages/ocamlbuild/ocamlbuild.0.13.1/descr similarity index 100% rename from packages/ocamlbuild/ocamlbuild.0.13.0/descr rename to packages/ocamlbuild/ocamlbuild.0.13.1/descr diff --git a/packages/ocamlbuild/ocamlbuild.0.13.0/opam b/packages/ocamlbuild/ocamlbuild.0.13.1/opam similarity index 100% rename from packages/ocamlbuild/ocamlbuild.0.13.0/opam rename to packages/ocamlbuild/ocamlbuild.0.13.1/opam diff --git a/packages/ocamlbuild/ocamlbuild.0.13.1/url b/packages/ocamlbuild/ocamlbuild.0.13.1/url new file mode 100644 index 00000000000..d3f3431d57f --- /dev/null +++ b/packages/ocamlbuild/ocamlbuild.0.13.1/url @@ -0,0 +1,2 @@ +http: "https://github.com/ocaml/ocamlbuild/archive/0.13.1.tar.gz" +checksum: "22e1f5e0f523a08187d955e8b871bc61"