summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoritz Angermann <moritz.angermann@gmail.com>2021-01-12 16:04:37 +0800
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-01-17 05:56:56 -0500
commitd2b10eac6eab85ef50071261c55da94a20fc6d0f (patch)
tree29880e9dffd3c8f108155ee13585d5fcffca0135
parent5ae73f69e5bafa41ddcab2771dbaed5b718c6f83 (diff)
downloadhaskell-d2b10eac6eab85ef50071261c55da94a20fc6d0f.tar.gz
Bump gmp submodule, now with arm64 support
m---------libraries/ghc-bignum/gmp/gmp-tarballs0
-rw-r--r--libraries/ghc-bignum/gmp/gmpsrc.patch62
2 files changed, 31 insertions, 31 deletions
diff --git a/libraries/ghc-bignum/gmp/gmp-tarballs b/libraries/ghc-bignum/gmp/gmp-tarballs
-Subproject ff5a56f169a8c6564f469008b21ad8ec0bc9d49
+Subproject 31f9909680ba8fe00d27fd8a6f5d198a0a96c1a
diff --git a/libraries/ghc-bignum/gmp/gmpsrc.patch b/libraries/ghc-bignum/gmp/gmpsrc.patch
index 067f58e902..d539b9545f 100644
--- a/libraries/ghc-bignum/gmp/gmpsrc.patch
+++ b/libraries/ghc-bignum/gmp/gmpsrc.patch
@@ -1,16 +1,40 @@
-diff -Naur gmp-6.1.2/configure gmpbuild/configure
---- gmp-6.1.2/configure 2016-12-16 10:45:32.000000000 -0500
-+++ gmpbuild/configure 2017-01-29 15:18:01.037775639 -0500
-@@ -28181,7 +28181,7 @@
+diff -Naur gmp-6.2.1/Makefile.am gmpbuild/Makefile.am
+--- gmp-6.2.1/Makefile.am 2020-11-15 02:45:09.000000000 +0800
++++ gmpbuild/Makefile.am 2021-01-09 22:56:14.571708858 +0800
+@@ -112,7 +112,7 @@
+ LIBGMPXX_LT_AGE = 6
+
+
+-SUBDIRS = tests mpn mpz mpq mpf printf scanf rand cxx demos tune doc
++SUBDIRS = tests mpn mpz mpq mpf printf scanf rand cxx demos tune
+
+ EXTRA_DIST = configfsf.guess configfsf.sub .gdbinit INSTALL.autoconf \
+ COPYING.LESSERv3 COPYINGv2 COPYINGv3
+diff -Naur gmp-6.2.1/Makefile.in gmpbuild/Makefile.in
+--- gmp-6.2.1/Makefile.in 2020-11-15 02:45:16.000000000 +0800
++++ gmpbuild/Makefile.in 2021-01-10 16:15:37.387670402 +0800
+@@ -572,7 +572,7 @@
+ LIBGMPXX_LT_CURRENT = 10
+ LIBGMPXX_LT_REVISION = 1
+ LIBGMPXX_LT_AGE = 6
+-SUBDIRS = tests mpn mpz mpq mpf printf scanf rand cxx demos tune doc
++SUBDIRS = tests mpn mpz mpq mpf printf scanf rand cxx demos tune
+
+ # Put asl.h here for now.
+
+diff -Naur gmp-6.2.1/configure gmpbuild/configure
+--- gmp-6.2.1/configure 2020-11-15 02:45:15.000000000 +0800
++++ gmpbuild/configure 2021-01-10 16:13:59.196004951 +0800
+@@ -27985,7 +27985,7 @@
# FIXME: Upcoming version of autoconf/automake may not like broken lines.
# Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
--ac_config_files="$ac_config_files Makefile mpf/Makefile mpn/Makefile mpq/Makefile mpz/Makefile printf/Makefile scanf/Makefile rand/Makefile cxx/Makefile tests/Makefile tests/devel/Makefile tests/mpf/Makefile tests/mpn/Makefile tests/mpq/Makefile tests/mpz/Makefile tests/rand/Makefile tests/misc/Makefile tests/cxx/Makefile doc/Makefile tune/Makefile demos/Makefile demos/calc/Makefile demos/expr/Makefile gmp.h:gmp-h.in"
-+ac_config_files="$ac_config_files Makefile mpf/Makefile mpn/Makefile mpq/Makefile mpz/Makefile printf/Makefile scanf/Makefile rand/Makefile cxx/Makefile tests/Makefile tests/devel/Makefile tests/mpf/Makefile tests/mpn/Makefile tests/mpq/Makefile tests/mpz/Makefile tests/rand/Makefile tests/misc/Makefile tests/cxx/Makefile tune/Makefile demos/Makefile demos/calc/Makefile demos/expr/Makefile gmp.h:gmp-h.in"
+-ac_config_files="$ac_config_files Makefile mpf/Makefile mpn/Makefile mpq/Makefile mpz/Makefile printf/Makefile scanf/Makefile rand/Makefile cxx/Makefile tests/Makefile tests/devel/Makefile tests/mpf/Makefile tests/mpn/Makefile tests/mpq/Makefile tests/mpz/Makefile tests/rand/Makefile tests/misc/Makefile tests/cxx/Makefile doc/Makefile tune/Makefile demos/Makefile demos/calc/Makefile demos/expr/Makefile gmp.h:gmp-h.in gmp.pc:gmp.pc.in gmpxx.pc:gmpxx.pc.in"
++ac_config_files="$ac_config_files Makefile mpf/Makefile mpn/Makefile mpq/Makefile mpz/Makefile printf/Makefile scanf/Makefile rand/Makefile cxx/Makefile tests/Makefile tests/devel/Makefile tests/mpf/Makefile tests/mpn/Makefile tests/mpq/Makefile tests/mpz/Makefile tests/rand/Makefile tests/misc/Makefile tests/cxx/Makefile tune/Makefile demos/Makefile demos/calc/Makefile demos/expr/Makefile gmp.h:gmp-h.in gmp.pc:gmp.pc.in gmpxx.pc:gmpxx.pc.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -29325,7 +29325,6 @@
+@@ -29129,7 +29129,6 @@
"tests/rand/Makefile") CONFIG_FILES="$CONFIG_FILES tests/rand/Makefile" ;;
"tests/misc/Makefile") CONFIG_FILES="$CONFIG_FILES tests/misc/Makefile" ;;
"tests/cxx/Makefile") CONFIG_FILES="$CONFIG_FILES tests/cxx/Makefile" ;;
@@ -18,27 +42,3 @@ diff -Naur gmp-6.1.2/configure gmpbuild/configure
"tune/Makefile") CONFIG_FILES="$CONFIG_FILES tune/Makefile" ;;
"demos/Makefile") CONFIG_FILES="$CONFIG_FILES demos/Makefile" ;;
"demos/calc/Makefile") CONFIG_FILES="$CONFIG_FILES demos/calc/Makefile" ;;
-diff -Naur gmp-6.1.2/Makefile.am gmpbuild/Makefile.am
---- gmp-6.1.2/Makefile.am 2016-12-16 10:45:27.000000000 -0500
-+++ gmpbuild/Makefile.am 2017-01-29 15:14:20.764370926 -0500
-@@ -110,7 +110,7 @@
- LIBGMPXX_LT_AGE = 5
-
-
--SUBDIRS = tests mpn mpz mpq mpf printf scanf rand cxx demos tune doc
-+SUBDIRS = tests mpn mpz mpq mpf printf scanf rand cxx demos tune
-
- EXTRA_DIST = configfsf.guess configfsf.sub .gdbinit INSTALL.autoconf \
- COPYING.LESSERv3 COPYINGv2 COPYINGv3
-diff -Naur gmp-6.1.2/Makefile.in gmpbuild/Makefile.in
---- gmp-6.1.2/Makefile.in 2016-12-16 10:45:34.000000000 -0500
-+++ gmpbuild/Makefile.in 2017-01-29 15:14:32.596446554 -0500
-@@ -566,7 +566,7 @@
- LIBGMPXX_LT_CURRENT = 9
- LIBGMPXX_LT_REVISION = 2
- LIBGMPXX_LT_AGE = 5
--SUBDIRS = tests mpn mpz mpq mpf printf scanf rand cxx demos tune doc
-+SUBDIRS = tests mpn mpz mpq mpf printf scanf rand cxx demos tune
-
- # The "test -f" support for srcdir!=builddir is similar to the automake .c.o
- # etc rules, but with each foo.c explicitly, since $< is not portable