Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ocaml-4.08.1:ver. bump

Browse Source
This commit is contained in:
Rmys
2019-11-25 22:53:07 +03:00
parent 96a85fc11f
commit 0fc5843e64
8 changed files with 5351 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files
office/calligra/calligra-plan/pspec.xml
+1
View File
@@ -71,6 +71,7 @@
<Dependency>kparts</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>kconfig</Dependency>
<Dependency>kwallet</Dependency>
<Dependency>kxmlgui</Dependency>
<Dependency>karchive</Dependency>
<Dependency>kcalcore</Dependency>
programming/language/ocaml/ocaml/actions.py
+6 -6
View File
@@ -15,7 +15,6 @@ def setup():
autotools.rawConfigure("-prefix /usr \
-bindir /usr/bin \
-x11include /usr/include \
-libdir /usr/lib/ocaml \
-mandir /usr/share/man \
--with-pthread")
@@ -24,13 +23,14 @@ def build():
autotools.make("-j1 world")
autotools.make("-j1 opt")
autotools.make("-j1 opt.opt")
autotools.make("-C emacs ocamltags")
#autotools.make("-C emacs ocamltags")
def install():
autotools.rawInstall("BINDIR=%(install)s/usr/bin \
LIBDIR=%(install)s/usr/lib/ocaml \
MANDIR=%(install)s/usr/share/man" \
% { "install": get.installDIR()})
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
#autotools.rawInstall("BINDIR=%(install)s/usr/bin \
#LIBDIR=%(install)s/usr/lib/ocaml \
#MANDIR=%(install)s/usr/share/man" \
#% { "install": get.installDIR()})
pisitools.dodoc("Changes", "LICENSE", "README*")
programming/language/ocaml/ocaml/files/fedora/0001-Don-t-add-rpaths-to-libraries.patch
+8 -8
View File
@@ -1,27 +1,27 @@
From 8ddacdf1283fe3d7054f51a4b764bc6b44d7a342 Mon Sep 17 00:00:00 2001
From d3bc916ff1bc467c503e21015db9c1e2a47a64f2 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 24 Jun 2014 10:00:15 +0100
Subject: [PATCH 1/8] Don't add rpaths to libraries.
Subject: [PATCH 1/5] Don't add rpaths to libraries.
---
tools/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/Makefile b/tools/Makefile
index 78d2a1068..fbec019ed 100644
index ee0e0be4c..7c96b6405 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -157,8 +157,8 @@ $(call byte_and_opt,ocamlmklib,ocamlmklibconfig.cmo config.cmo misc.cmo \
ocamlmklibconfig.ml: ../config/Makefile Makefile
@@ -153,8 +153,8 @@ $(call byte_and_opt,ocamlmklib,ocamlmklibconfig.cmo config.cmo \
ocamlmklibconfig.ml: $(ROOTDIR)/Makefile.config Makefile
(echo 'let bindir = "$(BINDIR)"'; \
echo 'let supports_shared_libraries = $(SUPPORTS_SHARED_LIBRARIES)';\
- echo 'let default_rpath = "$(RPATH)"'; \
- echo 'let mksharedlibrpath = "$(MKSHAREDLIBRPATH)"'; \
+ echo 'let default_rpath = ""'; \
+ echo 'let mksharedlibrpath = ""'; \
echo 'let toolpref = "$(TOOLPREF)"'; \
sed -n -e 's/^#ml //p' ../config/Makefile) \
echo 'let toolpref = "$(TOOLPREF)"';) \
> ocamlmklibconfig.ml
--
2.17.1
2.22.0.rc3
programming/language/ocaml/ocaml/files/fedora/0003-configure-Allow-user-defined-C-compiler-flags.patch
+16 -16
View File
@@ -1,27 +1,27 @@
From 8ddd2fb4909bf6ed1a3506723126432da8fcf0c4 Mon Sep 17 00:00:00 2001
From 8cc56a1515816c9cef84694e63eaed63a0474090 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 29 May 2012 20:44:18 +0100
Subject: [PATCH 3/8] configure: Allow user defined C compiler flags.
Subject: [PATCH 2/5] configure: Allow user defined C compiler flags.
---
configure | 4 ++++
configure.ac | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/configure b/configure
index 1316b3c1e..53f45f85b 100755
--- a/configure
+++ b/configure
@@ -2050,6 +2050,10 @@ if $flat_float_array; then
echo "#define FLAT_FLOAT_ARRAY" >> m.h
fi
diff --git a/configure.ac b/configure.ac
index f5d8a2687..ad5b701bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -553,6 +553,10 @@ AS_CASE([$host],
internal_cflags="$gcc_warnings"],
[common_cflags="-O"])])
+# Allow user defined C Compiler flags
+bytecccompopts="$bytecccompopts $CFLAGS"
+nativecccompopts="$nativecccompopts $CFLAGS"
+# Allow CFLAGS and LDFLAGS to be added.
+common_cflags="$common_cflags $CFLAGS"
+oc_ldflags="$oc_ldflags $LDFLAGS"
+
# Finish generated files
internal_cppflags="-DCAML_NAME_SPACE $internal_cppflags"
cclibs="$cclibs $mathlib"
# Enable SSE2 on x86 mingw to avoid using 80-bit registers.
--
2.17.1
2.22.0.rc3
programming/language/ocaml/ocaml/files/fedora/0003-configure-Remove-incorrect-assumption-about-cross-co.patch
+27
View File
@@ -0,0 +1,27 @@
From 0204a1137a8e8058afd1665aa6112656bc7bf0be Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 26 Apr 2019 16:16:29 +0100
Subject: [PATCH 3/5] configure: Remove incorrect assumption about
cross-compiling.
See https://github.com/ocaml/ocaml/issues/8647#issuecomment-487094390
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index ad5b701bd..2227769e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -959,7 +959,7 @@ AS_CASE([$host],
[*-*-mingw32|*-pc-windows], [asppprofflags=''],
[asppprofflags='-DPROFILING'])
-AS_IF([test -n "$host_alias"], [toolpref="${host_alias}-"], [toolpref=""])
+#AS_IF([test -n "$host_alias"], [toolpref="${host_alias}-"], [toolpref=""])
# We first compute default values for as and aspp
# If values have been given by the user then they take precedence over
--
2.22.0.rc3
programming/language/ocaml/ocaml/files/fedora/0004-Add-RISC-V-backend.patch
+5251 -421
View File
File diff suppressed because it is too large Load Diff
programming/language/ocaml/ocaml/files/fedora/0008-riscv-Emit-debug-info.patch
+10 -10
View File
@@ -1,14 +1,14 @@
From af276d83f41cb9eb9f1e50a75a9be205c9b2fee6 Mon Sep 17 00:00:00 2001
From 2f23a53b4aa1b672b3919cc021b83548f713b90a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 5 Jun 2018 19:48:08 +0000
Subject: [PATCH 8/8] riscv: Emit debug info.
Subject: [PATCH 5/5] riscv: Emit debug info.
---
asmcomp/riscv/emit.mlp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/asmcomp/riscv/emit.mlp b/asmcomp/riscv/emit.mlp
index 718dca080..e42ee9770 100644
index 88ea9f884..cc05aefe4 100644
--- a/asmcomp/riscv/emit.mlp
+++ b/asmcomp/riscv/emit.mlp
@@ -261,6 +261,7 @@ let tailrec_entry_point = ref 0
@@ -18,16 +18,16 @@ index 718dca080..e42ee9770 100644
+ emit_debug_info i.dbg;
match i.desc with
Lend -> ()
| Lop(Imove | Ispill | Ireload) ->
@@ -560,6 +561,7 @@ let fundecl fundecl =
emit_stack_adjustment (-n);
if !contains_calls then store_ra n;
`{emit_label !tailrec_entry_point}:\n`;
| Lprologue ->
@@ -556,6 +557,7 @@ let fundecl fundecl =
` {emit_string code_space}\n`;
` .align 2\n`;
`{emit_symbol fundecl.fun_name}:\n`;
+ emit_debug_info fundecl.fun_dbg;
emit_all fundecl.fun_body;
List.iter emit_call_gc !call_gc_sites;
List.iter emit_call_bound_error !bound_error_sites;
@@ -619,6 +621,7 @@ let data l =
@@ -615,6 +617,7 @@ let data l =
let begin_assembly() =
` .file \"\"\n`; (* PR#7073 *)
@@ -36,5 +36,5 @@ index 718dca080..e42ee9770 100644
let lbl_begin = Compilenv.make_symbol (Some "data_begin") in
` {emit_string data_space}\n`;
--
2.17.1
2.22.0.rc3
programming/language/ocaml/ocaml/pspec.xml
+32 -5
View File
@@ -18,7 +18,7 @@
Error: Files /usr/lib/ocaml/facile/facile.cmxa and /usr/lib/ocaml/stdlib.cmxa
make inconsistent assumptions over implementation Printf
-->
<Archive sha1sum="9dd56728f2ceea4784e6d574612fbcee2aa4c611" type="tarxz">http://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-4.07.0.tar.xz</Archive>
<Archive sha1sum="acac364d135b8f50247f0da6ee742752c08081ae" type="tarxz">http://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-4.08.1.tar.xz</Archive>
<BuildDependencies>
<Dependency>zlib-devel</Dependency>
<Dependency>ncurses-devel</Dependency>
@@ -27,12 +27,13 @@
</BuildDependencies>
<Patches>
<Patch level="1">fedora/0001-Don-t-add-rpaths-to-libraries.patch</Patch>
<Patch level="1">fedora/0002-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch</Patch>
<!-- <Patch level="1">fedora/0002-ocamlbyteinfo-ocamlplugininfo-Useful-utilities-from-.patch</Patch> -->
<Patch level="1">fedora/0003-configure-Allow-user-defined-C-compiler-flags.patch</Patch>
<Patch level="1">fedora/0003-configure-Remove-incorrect-assumption-about-cross-co.patch</Patch>
<Patch level="1">fedora/0004-Add-RISC-V-backend.patch</Patch>
<Patch level="1">fedora/0005-Copyright-untabify.patch</Patch>
<Patch level="1">fedora/0006-fix-caml_c_call-reload-caml_young_limit.patch</Patch>
<Patch level="1">fedora/0007-Adapt-to-4.07.patch</Patch>
<!-- <Patch level="1">fedora/0005-Copyright-untabify.patch</Patch> -->
<!-- <Patch level="1">fedora/0006-fix-caml_c_call-reload-caml_young_limit.patch</Patch> -->
<!-- <Patch level="1">fedora/0007-Adapt-to-4.07.patch</Patch> -->
<Patch level="1">fedora/0008-riscv-Emit-debug-info.patch</Patch>
</Patches>
</Source>
@@ -51,8 +52,34 @@
<Path fileType="man">/usr/share/man/</Path>
</Files>
</Package>
<Package>
<Name>ocaml-compiler-libs</Name>
<RuntimeDependencies>
<Dependency>ocaml</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/ocaml/compiler-libs/*.mli</Path>
<Path fileType="library">/usr/lib/ocaml/compiler-libs/*.cmi</Path>
<Path fileType="library">/usr/lib/ocaml/compiler-libs/*.cmo</Path>
<Path fileType="library">/usr/lib/ocaml/compiler-libs/*.cma</Path>
<Path fileType="library">/usr/lib/ocaml/compiler-libs/*.a</Path>
<Path fileType="library">/usr/lib/ocaml/compiler-libs/*.cmxa</Path>
<Path fileType="library">/usr/lib/ocaml/compiler-libs/*.cmx</Path>
<Path fileType="library">/usr/lib/ocaml/compiler-libs/*.o</Path>
<Path fileType="library">/usr/lib/ocaml/compiler-libs/*.cmt</Path>
<Path fileType="library">/usr/lib/ocaml/compiler-libs/*.cmti</Path>
</Files>
</Package>
<History>
<Update release="5">
<Date>2019-11-25</Date>
<Version>4.08.1</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-07-29</Date>
<Version>4.07.0</Version>