development/ocaml: Updated for version 4.08.1, changed maintainer.
Pass -fcommon for gcc >= 10.x Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
parent
6967cb342a
commit
3c7420c021
|
@ -1,13 +1,12 @@
|
|||
--- configure_old 2014-05-23 22:45:22.000000000 +0200
|
||||
+++ configure 2014-05-23 22:45:31.000000000 +0200
|
||||
@@ -1612,6 +1612,10 @@
|
||||
nativecccompopts="$nativecccompopts -fomit-frame-pointer";;
|
||||
esac
|
||||
|
||||
+# Add additional flags from the environment
|
||||
+bytecccompopts="$bytecccompopts $CFLAGS"
|
||||
+nativecccompopts="$nativecccompopts $CFLAGS"
|
||||
+
|
||||
# Finish generated files
|
||||
|
||||
cclibs="$cclibs $mathlib"
|
||||
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"
|
||||
|
|
|
@ -24,7 +24,8 @@
|
|||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
PRGNAM=ocaml
|
||||
VERSION=${VERSION:-4.03.0}
|
||||
VERSION=${VERSION:-4.08.1}
|
||||
MANVER=${MANVER:-4.08}
|
||||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
|
@ -70,17 +71,15 @@ 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 {} \;
|
||||
|
||||
patch < $CWD/configure.patch
|
||||
sed "s|@CFLAGS@|$SLKCFLAGS -fcommon|" $CWD/configure.patch | patch -p1
|
||||
|
||||
CFLAGS="$SLKCFLAGS" ./configure \
|
||||
./configure \
|
||||
--prefix /usr \
|
||||
--libdir /usr/lib${LIBDIRSUFFIX}/ocaml \
|
||||
--host $ARCH-slackware-linux
|
||||
--mandir /usr/man
|
||||
|
||||
make -j1 world.opt
|
||||
make -j1 install \
|
||||
PREFIX=$PKG/usr \
|
||||
LIBDIR=$PKG/usr/lib${LIBDIRSUFFIX}/ocaml
|
||||
make -j1 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
|
||||
|
@ -90,7 +89,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
|
|||
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
|
||||
cp -a Changes INSTALL* LICENSE README* VERSION \
|
||||
$PKG/usr/doc/$PRGNAM-$VERSION
|
||||
tar -xvf $CWD/ocaml-4.03-refman-html.tar.gz --no-same-owner -C $PKG/usr/doc/$PRGNAM-$VERSION/
|
||||
tar -xvf $CWD/ocaml-$MANVER-refman-html.tar.gz --no-same-owner -C $PKG/usr/doc/$PRGNAM-$VERSION/
|
||||
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
|
||||
|
||||
mkdir -p $PKG/install
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
PRGNAM="ocaml"
|
||||
VERSION="4.03.0"
|
||||
VERSION="4.08.1"
|
||||
HOMEPAGE="http://caml.inria.fr"
|
||||
DOWNLOAD="http://caml.inria.fr/pub/distrib/ocaml-4.03/ocaml-4.03.0.tar.xz \
|
||||
http://caml.inria.fr/pub/distrib/ocaml-4.03/ocaml-4.03-refman-html.tar.gz"
|
||||
MD5SUM="89f62881e03dfad0cf04991fbc03f955 \
|
||||
d3e44d3984d029d2e88ba219ad8e24c2"
|
||||
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_x86_64=""
|
||||
MD5SUM_x86_64=""
|
||||
REQUIRES=""
|
||||
MAINTAINER="Markus Hutmacher"
|
||||
EMAIL="mailing@markhu.de"
|
||||
MAINTAINER="Matteo Bernardini"
|
||||
EMAIL="ponce@slackbuilds.org"
|
||||
|
|
Loading…
Reference in New Issue