diff options
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | rename-array-module-for-ocaml-4.03.patch | 44 |
2 files changed, 50 insertions, 10 deletions
@@ -1,5 +1,6 @@ # Contributor: Simon Legner <Simon.Legner@gmail.com> # Contributor: Jakob Nixdorf <flocke@shadowice.org> +# Contributor: Bertram Felgenhauer <int-e@gmx.de> # Maintainer: Simon Legner <Simon.Legner@gmail.com> pkgname=camlidl pkgver=1.05 @@ -15,23 +16,24 @@ source=(http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/$pkgname-$pkg rename-array-module-for-ocaml-4.03.patch META.camlidl) -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i ${srcdir}/arch-build-system-fix.patch patch -Np1 -i ${srcdir}/rename-array-module-for-ocaml-4.03.patch - cp config/Makefile.unix config/Makefile +} +build() { + cd "$srcdir/$pkgname-$pkgver" make all } package() { cd "$srcdir/$pkgname-$pkgver" - + local _ocamldir=$(ocamlc -where) mkdir -p ${pkgdir}/usr/bin ${pkgdir}/${_ocamldir}/{caml,${pkgname}} - + make DESTDIR=${pkgdir} install install -Dm644 ${srcdir}/META.camlidl ${pkgdir}/${_ocamldir}/${pkgname}/META @@ -40,9 +42,9 @@ package() { md5sums=('4cfb863bc3cbdc1af2502042c45cc675' '9b7f92ec77b50d260b6487e4577bd5f0' - '162464cc1dfaf47019cbe2cef29bcab4' + '937930d2b49a6df80567464350cb3fd9' 'c8239780b7303f02b86ca6efc644640c') sha1sums=('2a0d5ba70fea8c1de1c5387f8b2058357b2177df' 'b5cf6873bda3fe48f9946f09ccea39cd60fda59c' - '7665ee975581904ce605b1c006baa92189d7f3de' + '19e42c60e2e7448951fc87bb70a3e8fb26244e08' 'cdabd68036a1f52c8ba8cfb22bde5a034ff8b620') diff --git a/rename-array-module-for-ocaml-4.03.patch b/rename-array-module-for-ocaml-4.03.patch index e62163ef8ebd..46f4f02ec864 100644 --- a/rename-array-module-for-ocaml-4.03.patch +++ b/rename-array-module-for-ocaml-4.03.patch @@ -1,17 +1,55 @@ -From 95b15cafc63e50a964c25b2b8e509e4ef847ef22 Mon Sep 17 00:00:00 2001 +From fd8f7aa5b1b29912bf794ae0df71a9b2207027f1 Mon Sep 17 00:00:00 2001 From: Bertram Felgenhauer <int-e@gmx.de> Date: Thu, 27 Oct 2016 10:45:43 +0200 -Subject: [PATCH 2/2] rename array module for ocaml 4.03 +Subject: [PATCH] rename array module for ocaml 4.03 --- + compiler/.depend | 14 +++++++------- compiler/Makefile | 2 +- compiler/{array.ml => array_camlidl.ml} | 0 compiler/{array.mli => array_camlidl.mli} | 0 compiler/cvtval.ml | 20 ++++++++++---------- - 4 files changed, 11 insertions(+), 11 deletions(-) + 5 files changed, 18 insertions(+), 18 deletions(-) rename compiler/{array.ml => array_camlidl.ml} (100%) rename compiler/{array.mli => array_camlidl.mli} (100%) +diff --git a/compiler/.depend b/compiler/.depend +index d014910..e58c23c 100644 +--- a/compiler/.depend ++++ b/compiler/.depend +@@ -1,4 +1,4 @@ +-array.cmi: idltypes.cmi prefix.cmi ++array_camlidl.cmi: idltypes.cmi prefix.cmi + constdecl.cmi: idltypes.cmi + cvttyp.cmi: idltypes.cmi + cvtval.cmi: idltypes.cmi prefix.cmi +@@ -22,10 +22,10 @@ typedef.cmi: idltypes.cmi + uniondecl.cmi: idltypes.cmi + union.cmi: idltypes.cmi prefix.cmi + variables.cmi: idltypes.cmi +-array.cmo: cvttyp.cmi idltypes.cmi lexpr.cmi utils.cmi variables.cmi \ +- array.cmi +-array.cmx: cvttyp.cmx idltypes.cmi lexpr.cmx utils.cmx variables.cmx \ +- array.cmi ++array_camlidl.cmo: cvttyp.cmi idltypes.cmi lexpr.cmi utils.cmi variables.cmi \ ++ array_camlidl.cmi ++array_camlidl.cmx: cvttyp.cmx idltypes.cmi lexpr.cmx utils.cmx variables.cmx \ ++ array_camlidl.cmi + clflags.cmo: config.cmi + clflags.cmx: config.cmx + config.cmo: config.cmi +@@ -34,9 +34,9 @@ constdecl.cmo: cvttyp.cmi idltypes.cmi lexpr.cmi utils.cmi constdecl.cmi + constdecl.cmx: cvttyp.cmx idltypes.cmi lexpr.cmx utils.cmx constdecl.cmi + cvttyp.cmo: config.cmi idltypes.cmi lexpr.cmi utils.cmi cvttyp.cmi + cvttyp.cmx: config.cmx idltypes.cmi lexpr.cmx utils.cmx cvttyp.cmi +-cvtval.cmo: array.cmi cvttyp.cmi enum.cmi idltypes.cmi lexpr.cmi struct.cmi \ ++cvtval.cmo: array_camlidl.cmi cvttyp.cmi enum.cmi idltypes.cmi lexpr.cmi struct.cmi \ + union.cmi utils.cmi variables.cmi cvtval.cmi +-cvtval.cmx: array.cmx cvttyp.cmx enum.cmx idltypes.cmi lexpr.cmx struct.cmx \ ++cvtval.cmx: array_camlidl.cmx cvttyp.cmx enum.cmx idltypes.cmi lexpr.cmx struct.cmx \ + union.cmx utils.cmx variables.cmx cvtval.cmi + enumdecl.cmo: cvttyp.cmi cvtval.cmi enum.cmi idltypes.cmi utils.cmi \ + variables.cmi enumdecl.cmi diff --git a/compiler/Makefile b/compiler/Makefile index 688d14a..5740330 100644 --- a/compiler/Makefile |