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

[Jürgen Hötzel]

    Date: Monday, January 22, 2018 @ 20:20:29
  Author: juergen
Revision: 315268

Fix compiler-libs split

Use same layout as Fedora RPMs

Modified:
  ocaml/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-22 20:09:31 UTC (rev 315267)
+++ PKGBUILD	2018-01-22 20:20:29 UTC (rev 315268)
@@ -32,6 +32,9 @@
   # install license
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+  # remove compiler libs
+  rm -rf "${pkgdir}/usr/lib/ocaml/compiler-libs"
 }
 
 package_ocaml-compiler-libs() {
@@ -41,16 +44,21 @@
 optdepends=()
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
+  # from Makefile
+  BYTESTART=driver/main.cmo
+  TOPLEVELSTART=toplevel/topstart.cmo
+  mkdir -p "${pkgdir}/usr/lib/ocaml/compiler-libs"
+  cp utils/*.cmi utils/*.cmt utils/*.cmti utils/*.mli \
+     parsing/*.cmi parsing/*.cmt parsing/*.cmti parsing/*.mli \
+     typing/*.cmi typing/*.cmt typing/*.cmti typing/*.mli \
+     bytecomp/*.cmi bytecomp/*.cmt bytecomp/*.cmti bytecomp/*.mli \
+     driver/*.cmi driver/*.cmt driver/*.cmti driver/*.mli \
+     toplevel/*.cmi toplevel/*.cmt toplevel/*.cmti toplevel/*.mli \
+     "${pkgdir}/usr/lib/ocaml/compiler-libs"
+  cp compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma \
+     compilerlibs/ocamltoplevel.cma ${BYTESTART} ${TOPLEVELSTART} \
+  "${pkgdir}/usr/lib/ocaml/compiler-libs"
 
-  # Install compiler libraries
-  local compiler_libs="${pkgdir}/usr/lib/ocaml/compiler-libs"
-  mkdir -p "$compiler_libs"/{parsing,typing,utils}
-  cp parsing/*.{cmi,cmo,cmx,ml,mli,mll,o} "$compiler_libs"/parsing
-  cp typing/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/typing
-  cp utils/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/utils
-  # duplicated by installation
-  rm -f "$compiler_libs"/typing/outcometree.{cmi,mli}
-
   # install license
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"