From bc0657f7159d0b01373ecb59afc426b98a172b1e Mon Sep 17 00:00:00 2001 From: Parabola Date: Thu, 1 Dec 2011 14:10:29 +0000 Subject: Thu Dec 1 14:10:27 UTC 2011 --- testing/ocaml/PKGBUILD | 57 ------------------------- testing/ocaml/fix-ocaml-binutils-2.21.patch | 66 ----------------------------- 2 files changed, 123 deletions(-) delete mode 100644 testing/ocaml/PKGBUILD delete mode 100644 testing/ocaml/fix-ocaml-binutils-2.21.patch (limited to 'testing/ocaml') diff --git a/testing/ocaml/PKGBUILD b/testing/ocaml/PKGBUILD deleted file mode 100644 index 1ea6e5ccd..000000000 --- a/testing/ocaml/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 143470 2011-11-24 17:03:04Z stephane $ -# Maintainer: Tobias Powalowski - -pkgbase='ocaml' -pkgname=('ocaml' 'ocaml-compiler-libs') -pkgver=3.12.1 -pkgrel=3 -pkgdesc="A functional language with OO extensions" -arch=('i686' 'x86_64') -license=('LGPL2' 'custom: QPL-1.0') -url="http://caml.inria.fr/" -depends=('gdbm') -makedepends=('tk' 'ncurses>=5.6-7' 'libx11') -optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') -source=(http://caml.inria.fr/distrib/ocaml-3.12/${pkgname}-${pkgver}.tar.gz) -md5sums=('814a047085f0f901ab7d8e3a4b7a9e65') -options=('!makeflags' '!emptydirs') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure -prefix /usr - make world.opt -} - -package_ocaml() { - cd "${srcdir}/${pkgbase}-${pkgver}" - make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install - - # Save >10MB with this one, makepkg only strips debug symbols. - #find "${pkgdir}/usr/lib" -type f -name '*.so.*' -exec strip --strip-unneeded {} \; - - # install license - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" -} - -package_ocaml-compiler-libs() { -pkgdesc="Several modules used internally by the OCaml compiler" -license=('custom: QPL-1.0') -depends=('ocaml') -optdepends=() - - cd "${srcdir}/${pkgbase}-${pkgver}" - - # 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}/" -} diff --git a/testing/ocaml/fix-ocaml-binutils-2.21.patch b/testing/ocaml/fix-ocaml-binutils-2.21.patch deleted file mode 100644 index fa7664cec..000000000 --- a/testing/ocaml/fix-ocaml-binutils-2.21.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Stephane Glondu -Date: Tue, 8 Mar 2011 21:17:40 +0100 -Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Bug: http://caml.inria.fr/mantis/view.php?id=5237 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404 -Authors: Eric Cooper, spiralvoice -Reviewed-by: Stéphane Glondu ---- - asmcomp/amd64/emit.mlp | 13 +++++++------ - asmcomp/i386/emit.mlp | 6 +++--- - 2 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp -index 4a3f844..525c6e6 100644 ---- a/asmcomp/amd64/emit.mlp -+++ b/asmcomp/amd64/emit.mlp -@@ -679,17 +679,18 @@ let fundecl fundecl = - emit_all true fundecl.fun_body; - List.iter emit_call_gc !call_gc_sites; - emit_call_bound_errors (); -+ begin match Config.system with -+ "linux" | "gnu" -> -+ ` .type {emit_symbol fundecl.fun_name},@function\n`; -+ ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` -+ | _ -> () -+ end; - if !float_constants <> [] then begin - if macosx - then ` .literal8\n` - else ` .section .rodata.cst8,\"a\",@progbits\n`; - List.iter emit_float_constant !float_constants -- end; -- match Config.system with -- "linux" | "gnu" -> -- ` .type {emit_symbol fundecl.fun_name},@function\n`; -- ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` -- | _ -> () -+ end - - (* Emission of data *) - -diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp -index 2992f29..0b1252c 100644 ---- a/asmcomp/i386/emit.mlp -+++ b/asmcomp/i386/emit.mlp -@@ -905,12 +905,12 @@ let fundecl fundecl = - emit_all true fundecl.fun_body; - List.iter emit_call_gc !call_gc_sites; - emit_call_bound_errors (); -- List.iter emit_float_constant !float_constants; -- match Config.system with -+ begin match Config.system with - "linux_elf" | "bsd_elf" | "gnu" -> - ` .type {emit_symbol fundecl.fun_name},@function\n`; - ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` -- | _ -> () -+ | _ -> () end; -+ List.iter emit_float_constant !float_constants - - - (* Emission of data *) --- -- cgit v1.2.3-54-g00ecf