From 812e700fe94bd869af5399a4010e8d00d9ab6734 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Thu, 24 Feb 2022 22:16:13 +0100 Subject: [PATCH] development/ocaml: Updated for version 4.13.1. Signed-off-by: Matteo Bernardini Signed-off-by: Willy Sudiarto Raharjo --- development/ocaml/configure.patch | 24 ++++++++++++------------ development/ocaml/ocaml.SlackBuild | 14 ++++++++------ development/ocaml/ocaml.info | 10 +++++----- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/development/ocaml/configure.patch b/development/ocaml/configure.patch index 31309d3511..4809a26c64 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 @@ - -fno-builtin-memcmp"; - internal_cflags="$gcc_warnings" ;; #( - gcc-*) : -- common_cflags="-O2 -fno-strict-aliasing -fwrapv"; -+ common_cflags="@CFLAGS@ -fno-strict-aliasing -fwrapv"; - internal_cflags="$gcc_warnings" ;; #( - msvc-*) : - common_cflags="-nologo -O2 -Gy- -MD" +diff -Naur ocaml-4.13.1.orig/configure ocaml-4.13.1/configure +--- ocaml-4.13.1.orig/configure 2021-09-30 17:40:11.000000000 +0200 ++++ ocaml-4.13.1/configure 2022-02-15 16:03:05.417656000 +0100 +@@ -12758,7 +12758,7 @@ + internal_cflags="-Wno-unused $cc_warnings \ + -fexcess-precision=standard" + # TODO: see whether the code can be fixed to avoid -Wno-unused +- common_cflags="-O2 -fno-strict-aliasing -fwrapv -mms-bitfields" ++ common_cflags="@CFLAGS@ -fno-strict-aliasing -fwrapv -mms-bitfields" + internal_cppflags='-D__USE_MINGW_ANSI_STDIO=0 -DUNICODE -D_UNICODE' + internal_cppflags="$internal_cppflags -DWINDOWS_UNICODE=" + internal_cppflags="${internal_cppflags}\$(WINDOWS_UNICODE)" ;; #( diff --git a/development/ocaml/ocaml.SlackBuild b/development/ocaml/ocaml.SlackBuild index 9134b591c3..d829c46138 100644 --- a/development/ocaml/ocaml.SlackBuild +++ b/development/ocaml/ocaml.SlackBuild @@ -4,6 +4,7 @@ # Copyright 2007-2014 Ferenc Deak # Copyright 2014 Markus Hutmacher +# Copyright 2016-2022 Matteo Bernardini # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,8 +27,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} @@ -81,15 +82,16 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -sed "s|@CFLAGS@|$SLKCFLAGS -fcommon|" $CWD/configure.patch | patch -p1 +sed "s|@CFLAGS@|$SLKCFLAGS|" $CWD/configure.patch | patch -p1 ./configure \ --prefix /usr \ --libdir /usr/lib${LIBDIRSUFFIX}/ocaml \ - --mandir /usr/man + --mandir /usr/man \ + --disable-force-safe-string -make -j1 world.opt -make -j1 DESTDIR=$PKG install +make 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 0747f3b19c..f627a9f78f 100644 --- a/development/ocaml/ocaml.info +++ b/development/ocaml/ocaml.info @@ -1,10 +1,10 @@ PRGNAM="ocaml" -VERSION="4.08.1" +VERSION="4.13.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" +DOWNLOAD="http://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.1.tar.xz \ + http://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=""