From f7fe3afbf191a8e343da587c25390a3883a5dee0 Mon Sep 17 00:00:00 2001 From: linok9757 Date: Mon, 21 Jan 2019 17:50:35 +0300 Subject: [PATCH] ocaml: bump version (#3578) --- ...caml-4.01.0.recipe => ocaml-4.07.0.recipe} | 42 ++- dev-lang/ocaml/patches/ocaml-4.01.0.patchset | 285 ------------------ 2 files changed, 31 insertions(+), 296 deletions(-) rename dev-lang/ocaml/{ocaml-4.01.0.recipe => ocaml-4.07.0.recipe} (66%) delete mode 100644 dev-lang/ocaml/patches/ocaml-4.01.0.patchset diff --git a/dev-lang/ocaml/ocaml-4.01.0.recipe b/dev-lang/ocaml/ocaml-4.07.0.recipe similarity index 66% rename from dev-lang/ocaml/ocaml-4.01.0.recipe rename to dev-lang/ocaml/ocaml-4.07.0.recipe index f1d8bc552..541eaeac7 100644 --- a/dev-lang/ocaml/ocaml-4.01.0.recipe +++ b/dev-lang/ocaml/ocaml-4.07.0.recipe @@ -12,18 +12,17 @@ with a native-code compiler that supports numerous architectures, for high \ performance; a bytecode compiler, for increased portability; and an \ interactive loop, for experimentation and rapid development." HOMEPAGE="http://caml.inria.fr/index.en.html" -COPYRIGHT="1996-2013 Institut National de Recherche en Informatique et en Automatique (INRIA)" +COPYRIGHT="1996-2018 Institut National de Recherche en Informatique et en Automatique (INRIA)" LICENSE="GNU LGPL v2" -REVISION="2" -SOURCE_URI="http://caml.inria.fr/pub/distrib/ocaml-4.01/ocaml-$portVersion.tar.gz" -CHECKSUM_SHA256="ea1751deff454f5c738d10d8a0ad135afee0852d391cf95766b726c0faf7cfdb" -#TODO: fix pthread test -PATCHES="ocaml-$portVersion.patchset" +REVISION="1" +SOURCE_URI="http://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-$portVersion.tar.gz" +CHECKSUM_SHA256="50e10b0c4e28300cb889e56839ec9e07e2847a85e04bfbd5a7ed0290b7239ef8" -ARCHITECTURES="x86 x86_gcc2 x86_64" +ARCHITECTURES="x86 !x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" - ocaml = $portVersion compat >= 4 + ocaml$secondaryArchSuffix = $portVersion compat >= 4 cmd:camlp4 = $portVersion compat >= 4 cmd:camlp4boot = $portVersion compat >= 4 cmd:camlp4o = $portVersion compat >= 4 @@ -41,39 +40,60 @@ PROVIDES=" cmd:camlp4rf.opt = $portVersion compat >= 4 cmd:mkcamlp4 = $portVersion compat >= 4 cmd:ocaml = $portVersion compat >= 4 + cmd:ocaml_instr_graph = $portVersion compat >= 4 + cmd:ocaml_instr_report = $portVersion compat >= 4 cmd:ocamlbuild = $portVersion compat >= 4 cmd:ocamlbuild.byte = $portVersion compat >= 4 cmd:ocamlbuild.native = $portVersion compat >= 4 cmd:ocamlc = $portVersion compat >= 4 + cmd:ocamlc.byte = $portVersion compat >= 4 cmd:ocamlc.opt = $portVersion compat >= 4 + cmd:ocamlcmt = $portVersion compat >= 4 cmd:ocamlcp = $portVersion compat >= 4 + cmd:ocamlcp.byte = $portVersion compat >= 4 + cmd:ocamlcp.opt = $portVersion compat >= 4 cmd:ocamldebug = $portVersion compat >= 4 cmd:ocamldep = $portVersion compat >= 4 + cmd:ocamldep.byte = $portVersion compat >= 4 cmd:ocamldep.opt = $portVersion compat >= 4 cmd:ocamldoc = $portVersion compat >= 4 cmd:ocamldoc.opt = $portVersion compat >= 4 cmd:ocamllex = $portVersion compat >= 4 + cmd:ocamllex.byte = $portVersion compat >= 4 cmd:ocamllex.opt = $portVersion compat >= 4 cmd:ocamlmklib = $portVersion compat >= 4 + cmd:ocamlmklib.byte = $portVersion compat >= 4 + cmd:ocamlmklib.opt = $portVersion compat >= 4 cmd:ocamlmktop = $portVersion compat >= 4 + cmd:ocamlmktop.byte = $portVersion compat >= 4 + cmd:ocamlmktop.opt = $portVersion compat >= 4 cmd:ocamlobjinfo = $portVersion compat >= 4 + cmd:ocamlobjinfo.byte = $portVersion compat >= 4 + cmd:ocamlobjinfo.opt = $portVersion compat >= 4 cmd:ocamlopt = $portVersion compat >= 4 + cmd:ocamlopt.byte = $portVersion compat >= 4 cmd:ocamlopt.opt = $portVersion compat >= 4 cmd:ocamloptp = $portVersion compat >= 4 + cmd:ocamloptp.byte = $portVersion compat >= 4 + cmd:ocamloptp.opt = $portVersion compat >= 4 cmd:ocamlprof = $portVersion compat >= 4 + cmd:ocamlprof.byte = $portVersion compat >= 4 + cmd:ocamlprof.opt = $portVersion compat >= 4 cmd:ocamlrun = $portVersion compat >= 4 + cmd:ocamlrund = $portVersion compat >= 4 + cmd:ocamlruni = $portVersion compat >= 4 cmd:ocamlyacc = $portVersion compat >= 4 " REQUIRES=" - haiku + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku_devel + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:make - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:awk cmd:sed cmd:grep diff --git a/dev-lang/ocaml/patches/ocaml-4.01.0.patchset b/dev-lang/ocaml/patches/ocaml-4.01.0.patchset deleted file mode 100644 index 4d85d0195..000000000 --- a/dev-lang/ocaml/patches/ocaml-4.01.0.patchset +++ /dev/null @@ -1,285 +0,0 @@ -From d536d33f14b403bf1eaa6214844a55a4fcb632f8 Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Wed, 30 Oct 2013 21:35:40 -0600 -Subject: import old patch - - -diff --git a/configure b/configure -index 07b1c35..0b386f1 100755 ---- a/configure -+++ b/configure -@@ -290,6 +290,10 @@ case "$bytecc,$host" in - bytecccompopts="-fno-defer-pop $gcc_warnings" - # No -lm library - mathlib="";; -+ *,*-*-haiku*) -+ bytecccompopts="-fno-defer-pop $gcc_warnings" -+ # No -lm library -+ mathlib="";; - gcc,alpha*-*-osf*) - bytecccompopts="-fno-defer-pop $gcc_warnings" - if cc="$bytecc" sh ./hasgot -mieee; then -@@ -622,6 +626,9 @@ if test $withsharedlibs = "yes"; then - byteccrpath="-Wl,-rpath," - mksharedlibrpath="-Wl,-rpath," - shared_libraries_supported=true;; -+ *-*haiku*) -+ mksharedlib="$bytecc -shared" -+ shared_libraries_supported=true;; - esac - fi - -@@ -687,6 +694,7 @@ case "$host" in - arch=i386; system=solaris - fi;; - i[3456]86-*-beos*) arch=i386; system=beos;; -+ i[3456]86-*-haiku*) arch=i386; system=beos;; - i[3456]86-*-cygwin*) arch=i386; system=cygwin;; - i[3456]86-*-darwin*) if $arch64; then - arch=amd64; system=macosx -@@ -918,6 +926,11 @@ elif sh ./hasgot -lnsl -lsocket socket socketpair bind listen accept connect; th - cclibs="$cclibs -lnsl -lsocket" - echo "#define HAS_SOCKETS" >> s.h - has_sockets=yes -+elif sh ./hasgot -lnetwork socket socketpair bind listen accept connect; then -+ echo "You have BSD sockets (with libraries '-lnetwork')" -+ cclibs="$cclibs -lnetwork" -+ echo "#define HAS_SOCKETS" >> s.h -+ has_sockets=yes - fi - - if sh ./hasgot -i sys/socket.h -t socklen_t; then -diff --git a/otherlibs/unix/nice.c b/otherlibs/unix/nice.c -index 019e2d1..e765a60 100644 ---- a/otherlibs/unix/nice.c -+++ b/otherlibs/unix/nice.c -@@ -22,7 +22,11 @@ CAMLprim value unix_nice(value incr) - { - int ret; - errno = 0; -+#ifdef __HAIKU__ -+ ret = 0; -+#else - ret = nice(Int_val(incr)); -+#endif - if (ret == -1 && errno != 0) uerror("nice", Nothing); - return Val_int(ret); - } --- -1.8.3.4 - - -From b35a7ca313da620259d7d304251d608620ac6b22 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 22 Mar 2014 19:48:57 +0000 -Subject: Haiku x86_64 support - - -diff --git a/config/gnu/config.guess b/config/gnu/config.guess -index 8152efd..1804e9f 100755 ---- a/config/gnu/config.guess -+++ b/config/gnu/config.guess -@@ -2,13 +2,13 @@ - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, --# 2011 Free Software Foundation, Inc. -+# 2011, 2012, 2013 Free Software Foundation, Inc. - --timestamp='2011-11-11' -+timestamp='2012-12-29' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or -+# the Free Software Foundation; either version 3 of the License, or - # (at your option) any later version. - # - # This program is distributed in the hope that it will be useful, but -@@ -17,26 +17,22 @@ timestamp='2011-11-11' - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- -- --# Originally written by Per Bothner. Please send patches (context --# diff format) to and include a ChangeLog --# entry. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). - # --# This script attempts to guess a canonical system name similar to --# config.sub. If it succeeds, it prints the system name on stdout, and --# exits with 0. Otherwise, it exits with 1. -+# Originally written by Per Bothner. - # - # You can get the latest version of this script from: - # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+# -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. -+ - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -57,8 +53,8 @@ GNU config.guess ($timestamp) - - Originally written by Per Bothner. - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free --Software Foundation, Inc. -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -+2012, 2013 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -145,7 +141,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or -- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, -+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward -@@ -202,6 +198,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; -+ *:Bitrig:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} -+ exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -@@ -304,7 +304,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; -- arm:riscos:*:*|arm:RISCOS:*:*) -+ arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) -@@ -803,6 +803,9 @@ EOF - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ *:MINGW64*:*) -+ echo ${UNAME_MACHINE}-pc-mingw64 -+ exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -@@ -863,6 +866,13 @@ EOF - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; -+ aarch64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -897,16 +907,16 @@ EOF - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) -- echo cris-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) -- echo crisv32-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - frv:Linux:*:*) -- echo frv-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - hexagon:Linux:*:*) -- echo hexagon-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - LIBC=gnu -@@ -948,7 +958,7 @@ EOF - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) -- echo or32-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu -@@ -989,7 +999,7 @@ EOF - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -1196,6 +1206,9 @@ EOF - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; -+ x86_64:Haiku:*:*) -+ echo x86_64-unknown-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1251,7 +1264,7 @@ EOF - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} - exit ;; -- NSE-?:NONSTOP_KERNEL:*:*) -+ NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) -@@ -1320,11 +1333,11 @@ EOF - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; -+ x86_64:VMkernel:*:*) -+ echo ${UNAME_MACHINE}-unknown-esx -+ exit ;; - esac - --#echo '(No uname command or uname output not recognized.)' 1>&2 --#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -- - eval $set_cc_for_build - cat >$dummy.c <