ocaml: update to 4.08.1.
This commit is contained in:
parent
b695ba32a9
commit
d0f296273b
@ -1,5 +1,5 @@
|
||||
--- ocaml-4.04.2/asmcomp/power/arch.ml
|
||||
+++ ocaml-4.04.2/asmcomp/power/arch.ml
|
||||
--- ocaml-4.08.0/asmcomp/power/arch.ml
|
||||
+++ ocaml-4.08.0/asmcomp/power/arch.ml
|
||||
@@ -28,7 +28,7 @@ type abi = ELF32 | ELF64v1 | ELF64v2
|
||||
let abi =
|
||||
match Config.model with
|
||||
@ -9,8 +9,8 @@
|
||||
| "ppc64le" -> ELF64v2
|
||||
| _ -> assert false
|
||||
|
||||
--- ocaml-4.04.2/asmrun/power.S
|
||||
+++ ocaml-4.04.2/asmrun/power.S
|
||||
--- ocaml-4.08.0/runtime/power.S
|
||||
+++ ocaml-4.08.0/runtime/power.S
|
||||
@@ -13,7 +13,7 @@
|
||||
/* */
|
||||
/**************************************************************************/
|
||||
@ -114,8 +114,8 @@
|
||||
.section ".opd","aw"
|
||||
#else
|
||||
.section ".text"
|
||||
--- ocaml-4.04.2/testsuite/tests/asmgen/power.S
|
||||
+++ ocaml-4.04.2/testsuite/tests/asmgen/power.S
|
||||
--- ocaml-4.08.0/testsuite/tools/asmgen_power.S
|
||||
+++ ocaml-4.08.0/testsuite/tools/asmgen_power.S
|
||||
@@ -25,12 +25,10 @@
|
||||
#if defined(MODEL_ppc)
|
||||
#define RESERVED_STACK 16
|
||||
@ -181,9 +181,9 @@
|
||||
mtctr 28
|
||||
mr 12, 28
|
||||
#else
|
||||
--- ocaml-4.04.2/byterun/caml/stack.h
|
||||
+++ ocaml-4.04.2/byterun/caml/stack.h
|
||||
@@ -40,10 +40,10 @@
|
||||
--- ocaml-4.08.0/runtime/caml/stack.h
|
||||
+++ ocaml-4.08.0/runtime/caml/stack.h
|
||||
@@ -35,10 +35,10 @@
|
||||
#if defined(MODEL_ppc)
|
||||
#define Saved_return_address(sp) *((intnat *)((sp) - 4))
|
||||
#define Callback_link(sp) ((struct caml_context *)((sp) + 16))
|
@ -1,6 +1,6 @@
|
||||
--- ocaml-4.04.2/asmcomp/emitaux.ml
|
||||
+++ ocaml-4.04.2/asmcomp/emitaux.ml
|
||||
@@ -205,6 +205,7 @@ let emit_frames a =
|
||||
--- ocaml-4.08.0/asmcomp/emitaux.ml
|
||||
+++ ocaml-4.08.0/asmcomp/emitaux.ml
|
||||
@@ -213,6 +213,7 @@ let emit_frames a =
|
||||
| None -> a.efa_word 0
|
||||
end
|
||||
in
|
||||
@ -8,8 +8,8 @@
|
||||
a.efa_word (List.length !frame_descriptors);
|
||||
List.iter emit_frame !frame_descriptors;
|
||||
Label_table.iter emit_debuginfo debuginfos;
|
||||
--- ocaml-4.04.2/asmrun/power.S
|
||||
+++ ocaml-4.04.2/asmrun/power.S
|
||||
--- ocaml-4.08.0/runtime/power.S
|
||||
+++ ocaml-4.08.0/runtime/power.S
|
||||
@@ -642,6 +642,7 @@ caml_system__code_end:
|
||||
/* Frame table */
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- ocaml-4.04.2/asmrun/signals_osdep.h
|
||||
+++ ocaml-4.04.2/asmrun/signals_osdep.h
|
||||
--- ocaml-4.04.2/runtime/signals_osdep.h
|
||||
+++ ocaml-4.04.2/runtime/signals_osdep.h
|
||||
@@ -297,11 +297,11 @@
|
||||
sigact.sa_flags = 0
|
||||
|
||||
@ -15,5 +15,5 @@
|
||||
+ #define CONTEXT_YOUNG_PTR (context->gp_regs[31])
|
||||
+ #define CONTEXT_SP (context->gp_regs[1])
|
||||
|
||||
/****************** s390x, ELF (Linux) */
|
||||
#elif defined(TARGET_s390x) && defined(SYS_elf)
|
||||
/****************** PowerPC, NetBSD */
|
||||
|
@ -1,25 +1,22 @@
|
||||
# Template file for 'ocaml'
|
||||
pkgname=ocaml
|
||||
version=4.07.1
|
||||
version=4.08.1
|
||||
revision=1
|
||||
build_style="gnu-configure"
|
||||
configure_args="--with-pic"
|
||||
make_build_target="world.opt"
|
||||
makedepends="ncurses-devel libX11-devel"
|
||||
short_desc="The main implementation of the Caml language"
|
||||
short_desc="Main implementation of the Caml language"
|
||||
maintainer="Leah Neukirchen <leah@vuxu.org>"
|
||||
license="QPL-1.0, LGPL-2.1-only"
|
||||
homepage="http://ocaml.org/"
|
||||
distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
|
||||
checksum=83683ddad54bd23773591a9f757e702fa5cfa2ea1b124d8fe75a73729e592bfe
|
||||
checksum=b53ed3d487b83fd49bc181bded066ae8e6fb592cf40514261d27d36050d5db85
|
||||
nocross=yes
|
||||
disable_parallel_build=yes
|
||||
patch_args="-Np1"
|
||||
|
||||
do_configure() {
|
||||
./configure -prefix /usr -mandir /usr/share/man -fPIC
|
||||
}
|
||||
do_build() {
|
||||
make ${makejobs} world.opt
|
||||
}
|
||||
do_install() {
|
||||
make PREFIX=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man install
|
||||
export ASPP="cc -c"
|
||||
|
||||
post_install() {
|
||||
vlicense LICENSE
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user