[arch-commits] Commit in ocaml/trunk (PKGBUILD ocaml-4.08.0.patch)

[Jürgen Hötzel]

    Date: Tuesday, June 18, 2019 @ 04:50:03
  Author: juergen
Revision: 356345

Fix OCaml build issues: https://github.com/ocaml/ocaml/issues/8742

Added:
  ocaml/trunk/ocaml-4.08.0.patch
Modified:
  ocaml/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   12 +++++++++---
 ocaml-4.08.0.patch |   13 +++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-18 04:26:31 UTC (rev 356344)
+++ PKGBUILD	2019-06-18 04:50:03 UTC (rev 356345)
@@ -11,10 +11,16 @@
 depends=('gdbm')
 makedepends=('tk>=8.6.0' 'ncurses>=5.6-7')
 optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
-source=(https://caml.inria.fr/distrib/ocaml-${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('7af535a715f13f666134a57c492984febd9327ba')
+source=(https://caml.inria.fr/distrib/ocaml-${pkgver%.*}/${pkgname}-${pkgver}.tar.xz ocaml-${pkgver}.patch)
+sha1sums=('7af535a715f13f666134a57c492984febd9327ba'
+          'edac6453b1aef6e97367af447f08dd3e8a3e2909')
 options=('!makeflags' '!emptydirs' 'staticlibs')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -i "${srcdir}/ocaml-${pkgver}.patch"
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure -prefix /usr -mandir '$(PREFIX)/share/man'
@@ -23,7 +29,7 @@
 
 package_ocaml() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}/usr" install
+  make DESTDIR="${pkgdir}" install
 
   # Save >10MB with this one, makepkg only strips debug symbols.
   #find "${pkgdir}/usr/lib" -type f -name '*.so.*' -exec strip --strip-unneeded {} \;

Added: ocaml-4.08.0.patch
===================================================================
--- ocaml-4.08.0.patch	                        (rev 0)
+++ ocaml-4.08.0.patch	2019-06-18 04:50:03 UTC (rev 356345)
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 2a9413a97..a0f7ac4b7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1285,7 +1285,5 @@ SOURCE_FILES=$(shell git ls-files '*.ml' '*.mli' | grep -v boot/menhir/parser)
+ 
+ AST_FILES=$(addsuffix .ast,$(SOURCE_FILES))
+ 
+-build-all-asts: $(AST_FILES)
+-
+ CAMLC_DPARSETREE := \
+        $(CAMLRUN) ./ocamlc -nostdlib -nopervasives \
+          -stop-after parsing -dparsetree
\ No newline at end of file