diff options
| -rw-r--r-- | development/ocaml/configure.patch | 14 | ||||
| -rw-r--r-- | development/ocaml/ocaml.SlackBuild | 21 | ||||
| -rw-r--r-- | development/ocaml/ocaml.info | 12 |
3 files changed, 26 insertions, 21 deletions
diff --git a/development/ocaml/configure.patch b/development/ocaml/configure.patch index 31309d35115c2..079050d701ea6 100644 --- a/development/ocaml/configure.patch +++ b/development/ocaml/configure.patch @@ -1,12 +1,12 @@ -diff -Naur ocaml-4.08.1.orig/configure ocaml-4.08.1/configure ---- ocaml-4.08.1.orig/configure 2019-08-05 19:32:44.000000000 +0200 -+++ ocaml-4.08.1/configure 2019-09-06 10:35:25.454923040 +0200 -@@ -12424,7 +12424,7 @@ +diff -Naur ocaml-4.12.0.orig/configure ocaml-4.12.0/configure +--- ocaml-4.12.0.orig/configure 2021-02-24 10:49:29.000000000 -0300 ++++ ocaml-4.12.0/configure 2021-06-07 00:30:10.161272617 -0300 +@@ -12706,7 +12706,7 @@ -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings" ;; #( + internal_cflags="$cc_warnings -fexcess-precision=standard" ;; #( gcc-*) : - common_cflags="-O2 -fno-strict-aliasing -fwrapv"; + common_cflags="@CFLAGS@ -fno-strict-aliasing -fwrapv"; - internal_cflags="$gcc_warnings" ;; #( + internal_cflags="$cc_warnings -fno-common \ + -fexcess-precision=standard" ;; #( msvc-*) : - common_cflags="-nologo -O2 -Gy- -MD" diff --git a/development/ocaml/ocaml.SlackBuild b/development/ocaml/ocaml.SlackBuild index 9134b591c301d..f42ff20786f90 100644 --- a/development/ocaml/ocaml.SlackBuild +++ b/development/ocaml/ocaml.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ocaml -VERSION=${VERSION:-4.08.1} -MANVER=${MANVER:-4.08} +VERSION=${VERSION:-4.13.1} +MANVER=${MANVER:-4.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -84,12 +84,17 @@ find -L . \ sed "s|@CFLAGS@|$SLKCFLAGS -fcommon|" $CWD/configure.patch | patch -p1 ./configure \ - --prefix /usr \ - --libdir /usr/lib${LIBDIRSUFFIX}/ocaml \ - --mandir /usr/man - -make -j1 world.opt -make -j1 DESTDIR=$PKG install + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX}/ocaml \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-static \ + --build=$ARCH-slackware-linux + +make world.opt || make -j1 world.opt +make DESTDIR=$PKG install find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/development/ocaml/ocaml.info b/development/ocaml/ocaml.info index 0747f3b19cb4a..036fc4b6b2d52 100644 --- a/development/ocaml/ocaml.info +++ b/development/ocaml/ocaml.info @@ -1,10 +1,10 @@ PRGNAM="ocaml" -VERSION="4.08.1" -HOMEPAGE="http://caml.inria.fr" -DOWNLOAD="http://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-4.08.1.tar.xz \ - http://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-4.08-refman-html.tar.gz" -MD5SUM="519f095a563323cdaa68301d58bf099d \ - 20cbe4bd141f175d723f58cb9e89b215" +VERSION="4.13.1" +HOMEPAGE="https://caml.inria.fr" +DOWNLOAD="https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.1.tar.xz \ + https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13-refman-html.tar.gz" +MD5SUM="52f91ba31fbfad426bf57b00ef3a34c1 \ + 513fcf9adc3a85268aa42f0552d8e971" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |