[arch-commits] Commit in ocaml/repos (8 files)
Tobias Powalowski
tpowa at archlinux.org
Thu Jan 17 15:01:31 UTC 2013
Date: Thursday, January 17, 2013 @ 10:01:31
Author: tpowa
Revision: 175505
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
ocaml/repos/extra-i686/PKGBUILD
(from rev 175504, ocaml/trunk/PKGBUILD)
ocaml/repos/extra-i686/tk8.6-build.patch
(from rev 175504, ocaml/trunk/tk8.6-build.patch)
ocaml/repos/extra-x86_64/PKGBUILD
(from rev 175504, ocaml/trunk/PKGBUILD)
ocaml/repos/extra-x86_64/tk8.6-build.patch
(from rev 175504, ocaml/trunk/tk8.6-build.patch)
Deleted:
ocaml/repos/extra-i686/PKGBUILD
ocaml/repos/extra-i686/fix-ocaml-binutils-2.21.patch
ocaml/repos/extra-x86_64/PKGBUILD
ocaml/repos/extra-x86_64/fix-ocaml-binutils-2.21.patch
--------------------------------------------+
extra-i686/PKGBUILD | 119 ++++++++++++++-------------
extra-i686/fix-ocaml-binutils-2.21.patch | 66 --------------
extra-i686/tk8.6-build.patch | 20 ++++
extra-x86_64/PKGBUILD | 119 ++++++++++++++-------------
extra-x86_64/fix-ocaml-binutils-2.21.patch | 66 --------------
extra-x86_64/tk8.6-build.patch | 20 ++++
6 files changed, 164 insertions(+), 246 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-01-17 15:01:00 UTC (rev 175504)
+++ extra-i686/PKGBUILD 2013-01-17 15:01:31 UTC (rev 175505)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgbase='ocaml'
-pkgname=('ocaml' 'ocaml-compiler-libs')
-pkgver=4.00.1
-pkgrel=2
-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>=8.6.0' 'ncurses>=5.6-7' 'libx11')
-optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
-source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz)
-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}/"
-}
-md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7')
Copied: ocaml/repos/extra-i686/PKGBUILD (from rev 175504, ocaml/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-01-17 15:01:31 UTC (rev 175505)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgbase='ocaml'
+pkgname=('ocaml' 'ocaml-compiler-libs')
+pkgver=4.00.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>=8.6.0' 'ncurses>=5.6-7' 'libx11')
+optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
+source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz
+ tk8.6-build.patch)
+options=('!makeflags' '!emptydirs')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure -prefix /usr
+ make world.opt
+}
+
+package_ocaml() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ # fix https://bugs.archlinux.org/task/33302
+ patch -Np2 -i ../tk8.6-build.patch
+ 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}/"
+}
+md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7')
+md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7'
+ '67b0a8a8885fc1221181b171541cb1b0')
Deleted: extra-i686/fix-ocaml-binutils-2.21.patch
===================================================================
--- extra-i686/fix-ocaml-binutils-2.21.patch 2013-01-17 15:01:00 UTC (rev 175504)
+++ extra-i686/fix-ocaml-binutils-2.21.patch 2013-01-17 15:01:31 UTC (rev 175505)
@@ -1,66 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-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 <steph at glondu.net>
----
- 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}, at 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\", at progbits\n`;
- List.iter emit_float_constant !float_constants
-- end;
-- match Config.system with
-- "linux" | "gnu" ->
-- ` .type {emit_symbol fundecl.fun_name}, at 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}, at 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 *)
---
Copied: ocaml/repos/extra-i686/tk8.6-build.patch (from rev 175504, ocaml/trunk/tk8.6-build.patch)
===================================================================
--- extra-i686/tk8.6-build.patch (rev 0)
+++ extra-i686/tk8.6-build.patch 2013-01-17 15:01:31 UTC (rev 175505)
@@ -0,0 +1,20 @@
+--- src/ocaml-4.00.1/configure 2012-06-26 08:33:50.000000000 -0700
++++ p/src/ocaml-4.00.1/configure 2013-01-05 17:06:54.877900143 -0800
+@@ -804,6 +804,9 @@
+ echo "ARCMD=ar" >> Makefile
+
+
++bytecccompopts="$bytecccompopts -DUSE_INTERP_RESULT"
++nativecccompopts="$nativecccompopts -DUSE_INTERP_RESULT"
++
+ # Do #! scripts work?
+
+ if (SHELL=/bin/sh; export SHELL; (./sharpbang || ./sharpbang2) >/dev/null); then
+@@ -1450,6 +1453,7 @@
+ if test -n "$tcl_version" && test "x$tcl_version" != "xnone"; then
+ echo "tcl.h and tk.h version $tcl_version found with \"$tk_defs\"."
+ case $tcl_version in
++ 8.6) tclmaj=8 tclmin=6 tkmaj=8 tkmin=6 ;;
+ 8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;;
+ 8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;;
+ 8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;;
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-01-17 15:01:00 UTC (rev 175504)
+++ extra-x86_64/PKGBUILD 2013-01-17 15:01:31 UTC (rev 175505)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgbase='ocaml'
-pkgname=('ocaml' 'ocaml-compiler-libs')
-pkgver=4.00.1
-pkgrel=2
-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>=8.6.0' 'ncurses>=5.6-7' 'libx11')
-optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
-source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz)
-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}/"
-}
-md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7')
Copied: ocaml/repos/extra-x86_64/PKGBUILD (from rev 175504, ocaml/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-01-17 15:01:31 UTC (rev 175505)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgbase='ocaml'
+pkgname=('ocaml' 'ocaml-compiler-libs')
+pkgver=4.00.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>=8.6.0' 'ncurses>=5.6-7' 'libx11')
+optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
+source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz
+ tk8.6-build.patch)
+options=('!makeflags' '!emptydirs')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure -prefix /usr
+ make world.opt
+}
+
+package_ocaml() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ # fix https://bugs.archlinux.org/task/33302
+ patch -Np2 -i ../tk8.6-build.patch
+ 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}/"
+}
+md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7')
+md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7'
+ '67b0a8a8885fc1221181b171541cb1b0')
Deleted: extra-x86_64/fix-ocaml-binutils-2.21.patch
===================================================================
--- extra-x86_64/fix-ocaml-binutils-2.21.patch 2013-01-17 15:01:00 UTC (rev 175504)
+++ extra-x86_64/fix-ocaml-binutils-2.21.patch 2013-01-17 15:01:31 UTC (rev 175505)
@@ -1,66 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-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 <steph at glondu.net>
----
- 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}, at 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\", at progbits\n`;
- List.iter emit_float_constant !float_constants
-- end;
-- match Config.system with
-- "linux" | "gnu" ->
-- ` .type {emit_symbol fundecl.fun_name}, at 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}, at 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 *)
---
Copied: ocaml/repos/extra-x86_64/tk8.6-build.patch (from rev 175504, ocaml/trunk/tk8.6-build.patch)
===================================================================
--- extra-x86_64/tk8.6-build.patch (rev 0)
+++ extra-x86_64/tk8.6-build.patch 2013-01-17 15:01:31 UTC (rev 175505)
@@ -0,0 +1,20 @@
+--- src/ocaml-4.00.1/configure 2012-06-26 08:33:50.000000000 -0700
++++ p/src/ocaml-4.00.1/configure 2013-01-05 17:06:54.877900143 -0800
+@@ -804,6 +804,9 @@
+ echo "ARCMD=ar" >> Makefile
+
+
++bytecccompopts="$bytecccompopts -DUSE_INTERP_RESULT"
++nativecccompopts="$nativecccompopts -DUSE_INTERP_RESULT"
++
+ # Do #! scripts work?
+
+ if (SHELL=/bin/sh; export SHELL; (./sharpbang || ./sharpbang2) >/dev/null); then
+@@ -1450,6 +1453,7 @@
+ if test -n "$tcl_version" && test "x$tcl_version" != "xnone"; then
+ echo "tcl.h and tk.h version $tcl_version found with \"$tk_defs\"."
+ case $tcl_version in
++ 8.6) tclmaj=8 tclmin=6 tkmaj=8 tkmin=6 ;;
+ 8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;;
+ 8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;;
+ 8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;;
More information about the arch-commits
mailing list