summaryrefslogtreecommitdiff
path: root/extra/ocaml
diff options
context:
space:
mode:
authorJoshua Ismael Haase Hernández <hahj87@gmail.com>2011-06-26 14:51:46 -0500
committerJoshua Ismael Haase Hernández <hahj87@gmail.com>2011-06-26 14:51:46 -0500
commit2095d71af1b9e0c1dff405c178a9481d1020ca3e (patch)
treea2190dce78cc35a9d986c1617b6c9aaeff9a3ed6 /extra/ocaml
parent3c73cfcac55209f61a48650c9254f72f46a93500 (diff)
parentd85795e61e77e250f1051d287241ef7cf2247cc6 (diff)
today batch
Diffstat (limited to 'extra/ocaml')
-rw-r--r--extra/ocaml/PKGBUILD13
-rw-r--r--extra/ocaml/fix-caml_int64_float_of_bits-n32.patch12
2 files changed, 22 insertions, 3 deletions
diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD
index 2e994e28d..c321869aa 100644
--- a/extra/ocaml/PKGBUILD
+++ b/extra/ocaml/PKGBUILD
@@ -12,16 +12,23 @@ 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
- fix-ocaml-binutils-2.21.patch)
+ fix-ocaml-binutils-2.21.patch
+ fix-caml_int64_float_of_bits-n32.patch)
options=('!makeflags' '!emptydirs')
md5sums=('3ba7cc65123c3579f14e7c726d3ee782'
- '8c664a0a346424ea2ec6fc6f713170c6')
+ '8c664a0a346424ea2ec6fc6f713170c6'
+ 'e2c8bc316efe40532c5b9d7f9a1d8d62')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/fix-ocaml-binutils-2.21.patch"
+ patch -Np1 -i "${srcdir}/fix-caml_int64_float_of_bits-n32.patch"
./configure -prefix /usr
- make world.opt
+ if [ "${CARCH}" == "mips64el" ] ; then
+ make world
+ else
+ make world.opt
+ fi
make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install
# Save >10MB with this one, makepkg only strips debug symbols.
diff --git a/extra/ocaml/fix-caml_int64_float_of_bits-n32.patch b/extra/ocaml/fix-caml_int64_float_of_bits-n32.patch
new file mode 100644
index 000000000..98755d30b
--- /dev/null
+++ b/extra/ocaml/fix-caml_int64_float_of_bits-n32.patch
@@ -0,0 +1,12 @@
+--- ocaml-3.12.0.orig/byterun/ints.c 2011-06-25 18:03:21.548733206 +0200
++++ ocaml-3.12.0/byterun/ints.c 2011-06-25 22:34:17.304788306 +0200
+@@ -585,6 +585,9 @@
+ return caml_copy_int64(u.i);
+ }
+
++#ifdef _ABIN32
++__attribute__((optimize(0)))
++#endif
+ CAMLprim value caml_int64_float_of_bits(value vi)
+ {
+ union { double d; int64 i; int32 h[2]; } u;