diff options
author | Antonio Rojas | 2015-07-26 19:50:01 +0200 |
---|---|---|
committer | Antonio Rojas | 2015-07-26 19:50:01 +0200 |
commit | 78f3213820ee84acbabeea68657b98711ff367b2 (patch) | |
tree | 2a87a89d164b92b454744361a1860b40a6b6ae53 | |
parent | aeb1ab581ef286b1e3797d0ae7550188e3da3eaa (diff) | |
download | aur-78f3213820ee84acbabeea68657b98711ff367b2.tar.gz |
Update patches for 6.8
-rw-r--r-- | .SRCINFO | 5 | ||||
-rw-r--r-- | PKGBUILD | 8 | ||||
-rw-r--r-- | clean.patch | 9 | ||||
-rw-r--r-- | env.patch | 8 | ||||
-rw-r--r-- | ntl9.patch | 178 |
5 files changed, 14 insertions, 194 deletions
@@ -89,15 +89,14 @@ pkgbase = sagemath-git source = skip-check.patch source = pexpect-env.patch source = pexpect-del.patch - source = ntl9.patch source = disable-fes.patch md5sums = SKIP md5sums = d9a3e113ed147dcee8f89962a8dccd43 md5sums = a906a180d198186a39820b0a2f9a9c63 md5sums = f72e544032b1a3f952b7ddafc3a49d63 - md5sums = a97ad60cca257b389f1e6e60eef2525f + md5sums = 843a6cc3b17a1850604593813321418e md5sums = fd8e3e07f5b7318e6a7200a3c64f5bc2 - md5sums = 193f8a3b421ead8d2c37f448f5402562 + md5sums = 23e972753be1e5d0f761a7f82a95cebf md5sums = 5947a420a0b1483f0cbc74c76895789b md5sums = a83a3b1bc7fcb7cbf752a83a8311fc42 md5sums = f333939ea6c41377b66407c81016cee4 @@ -42,14 +42,14 @@ provides=(sagemath sage-mathematics) source=("git://git.sagemath.org/sage.git#branch=develop" "http://mirrors.mit.edu/sage/spkg/upstream/pexpect/pexpect-2.0.tar.bz2" 'anal.h' 'package.patch' 'env.patch' 'paths.patch' 'clean.patch' 'skip-check.patch' -'pexpect-env.patch' 'pexpect-del.patch' 'ntl9.patch' 'disable-fes.patch') +'pexpect-env.patch' 'pexpect-del.patch' 'disable-fes.patch') md5sums=('SKIP' 'd9a3e113ed147dcee8f89962a8dccd43' 'a906a180d198186a39820b0a2f9a9c63' 'f72e544032b1a3f952b7ddafc3a49d63' - 'a97ad60cca257b389f1e6e60eef2525f' + '843a6cc3b17a1850604593813321418e' 'fd8e3e07f5b7318e6a7200a3c64f5bc2' - '193f8a3b421ead8d2c37f448f5402562' + '23e972753be1e5d0f761a7f82a95cebf' '5947a420a0b1483f0cbc74c76895789b' 'a83a3b1bc7fcb7cbf752a83a8311fc42' 'f333939ea6c41377b66407c81016cee4' @@ -97,8 +97,6 @@ prepare(){ patch -p0 -i "$srcdir"/disable-fes.patch # Upstream patches -# fix build aginst NTL 9 (Fedora) - patch -p0 -i "$srcdir"/ntl9.patch # use python2 sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec python|exec python2|' -i src/bin/* diff --git a/clean.patch b/clean.patch index 2fd8578adf7d..c4baf9bca8ff 100644 --- a/clean.patch +++ b/clean.patch @@ -1,6 +1,6 @@ ---- src/setup.py.orig 2015-07-01 18:33:45.847361894 +0200 -+++ src/setup.py 2015-07-01 18:34:16.834096443 +0200 -@@ -642,20 +642,6 @@ +--- src/setup.py.orig 2014-11-16 10:34:05.521441703 +0100 ++++ src/setup.py 2014-11-16 10:34:16.054812569 +0100 +@@ -581,21 +581,6 @@ ######################################################### @@ -13,7 +13,8 @@ -output_dirs = SITE_PACKAGES + glob.glob(os.path.join(SAGE_SRC, 'build', 'lib*')) -for output_dir in output_dirs: - print('- cleaning {0}'.format(output_dir)) -- clean_install_dir(output_dir, python_packages, python_modules, ext_modules) +- clean_install_dir(output_dir, python_packages, python_modules, +- ext_modules, python_data_files) -print('Finished cleaning, time: %.2f seconds.' % (time.time() - t)) - - diff --git a/env.patch b/env.patch index 430823ca1f40..d1429e35e0dc 100644 --- a/env.patch +++ b/env.patch @@ -60,7 +60,7 @@ - SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH - SAGE_ORIG_PATH_SET=True && export SAGE_ORIG_PATH_SET -fi --export PATH="$SAGE_SRC/bin:$SAGE_LOCAL/bin:$PATH" +-export PATH="$SAGE_ROOT/build/bin:$SAGE_SRC/bin:$SAGE_LOCAL/bin:$PATH" +export SAGE_LOCAL="$SAGE_ROOT" +export SAGE_ETC="/etc/sage" +export SAGE_SHARE="$SAGE_LOCAL/share/sage" @@ -112,9 +112,9 @@ if [ -z "${SAGE_ORIG_LD_LIBRARY_PATH_SET}" ]; then SAGE_ORIG_LD_LIBRARY_PATH=$LD_LIBRARY_PATH && export SAGE_ORIG_LD_LIBRARY_PATH @@ -431,8 +378,6 @@ - R_MAKEVARS_SITE="$SAGE_LOCAL/lib/R/share/Makevars.site" && export R_MAKEVARS_SITE - R_MAKEVARS_USER="$SAGE_LOCAL/lib/R/share/Makevars.user" && export R_MAKEVARS_USER - + fi + fi + fi -MAXIMA_PREFIX="$SAGE_ROOT/local" && export MAXIMA_PREFIX - ############ architecture flags diff --git a/ntl9.patch b/ntl9.patch deleted file mode 100644 index 191491826e8e..000000000000 --- a/ntl9.patch +++ /dev/null @@ -1,178 +0,0 @@ ---- ./src/sage/rings/bernmm/bernmm-test.cpp.orig 2015-02-16 17:15:12.000000000 -0700 -+++ ./src/sage/rings/bernmm/bernmm-test.cpp 2015-05-07 21:39:58.565251320 -0600 -@@ -70,7 +70,7 @@ void bern_naive(mpq_t* res, long n) - */ - int testcase__bern_modp_powg(long p, long k, mpq_t b) - { -- double pinv = 1 / ((double) p); -+ wide_double pinv = wide_double(1) / wide_double(p); - - // compute B_k mod p using _bern_modp_powg() - long x = _bern_modp_powg(p, pinv, k); -@@ -147,7 +147,7 @@ int test__bern_modp_powg() - */ - int testcase__bern_modp_pow2(long p, long k) - { -- double pinv = 1 / ((double) p); -+ wide_double pinv = wide_double(1) / wide_double(p); - - if (PowerMod(2, k, p, pinv) == 1) - return 1; ---- ./src/sage/rings/bernmm/bern_modp.cpp.orig 2015-02-16 17:15:12.000000000 -0700 -+++ ./src/sage/rings/bernmm/bern_modp.cpp 2015-05-07 20:17:37.680381004 -0600 -@@ -43,14 +43,14 @@ namespace bernmm { - pinv = 1 / ((double) p) - g = a multiplicative generator of GF(p), in [0, p) - */ --long bernsum_powg(long p, double pinv, long k, long g) -+long bernsum_powg(long p, wide_double pinv, long k, long g) - { - long half_gm1 = (g + ((g & 1) ? 0 : p) - 1) / 2; // (g-1)/2 mod p - long g_to_jm1 = 1; - long g_to_km1 = PowerMod(g, k-1, p, pinv); - long g_to_km1_to_j = g_to_km1; - long sum = 0; -- double g_pinv = ((double) g) / ((double) p); -+ wide_double g_pinv = wide_double(g) / wide_double(p); - mulmod_precon_t g_to_km1_pinv = PrepMulModPrecon(g_to_km1, p, pinv); - - for (long j = 1; j <= (p-1)/2; j++) -@@ -224,7 +224,7 @@ public: - #error Number of bits in a long must be divisible by TABLE_LG_SIZE - #endif - --long bernsum_pow2(long p, double pinv, long k, long g, long n) -+long bernsum_pow2(long p, wide_double pinv, long k, long g, long n) - { - // In the main summation loop we accumulate data into the _tables_ array; - // tables[y][z] contributes to the final answer with a weight of -@@ -481,7 +481,7 @@ long PrepRedc(long n) - (See bernsum_pow2() for code comments; we only add comments here where - something is different from bernsum_pow2()) - */ --long bernsum_pow2_redc(long p, double pinv, long k, long g, long n) -+long bernsum_pow2_redc(long p, wide_double pinv, long k, long g, long n) - { - long pinv2 = PrepRedc(p); - long F = (1L << (ULONG_BITS/2)) % p; -@@ -655,7 +655,7 @@ long bernsum_pow2_redc(long p, double pi - - Algorithm: uses bernsum_powg() to compute the main sum. - */ --long _bern_modp_powg(long p, double pinv, long k) -+long _bern_modp_powg(long p, wide_double pinv, long k) - { - Factorisation F(p-1); - long g = primitive_root(p, pinv, F); -@@ -685,7 +685,7 @@ long _bern_modp_powg(long p, double pinv - Algorithm: uses bernsum_pow2() (or bernsum_pow2_redc() if p is small - enough) to compute the main sum. - */ --long _bern_modp_pow2(long p, double pinv, long k) -+long _bern_modp_pow2(long p, wide_double pinv, long k) - { - Factorisation F(p-1); - long g = primitive_root(p, pinv, F); -@@ -717,7 +717,7 @@ long _bern_modp_pow2(long p, double pinv - 2 <= k <= p-3, k even - pinv = 1 / ((double) p) - */ --long _bern_modp(long p, double pinv, long k) -+long _bern_modp(long p, wide_double pinv, long k) - { - if (PowerMod(2, k, p, pinv) != 1) - // 2^k != 1 mod p, so we use the faster version -@@ -765,7 +765,7 @@ long bern_modp(long p, long k) - if (m == 0) - return -1; - -- double pinv = 1 / ((double) p); -+ wide_double pinv = wide_double(1) / wide_double (p); - long x = _bern_modp(p, pinv, m); // = B_m/m mod p - return MulMod(x, k, p, pinv); - } ---- ./src/sage/rings/bernmm/bern_modp.h.orig 2015-02-16 17:15:12.000000000 -0700 -+++ ./src/sage/rings/bernmm/bern_modp.h 2015-05-09 08:06:39.732529882 -0600 -@@ -12,6 +12,7 @@ - #ifndef BERNMM_BERN_MODP_H - #define BERNMM_BERN_MODP_H - -+#include <NTL/ZZ.h> - - namespace bernmm { - -@@ -29,8 +30,8 @@ long bern_modp(long p, long k); - /* - Exported for testing. - */ --long _bern_modp_powg(long p, double pinv, long k); --long _bern_modp_pow2(long p, double pinv, long k); -+long _bern_modp_powg(long p, NTL::wide_double pinv, long k); -+long _bern_modp_pow2(long p, NTL::wide_double pinv, long k); - - - }; ---- ./src/sage/rings/bernmm/bern_modp_util.cpp.orig 2015-02-16 17:15:12.000000000 -0700 -+++ ./src/sage/rings/bernmm/bern_modp_util.cpp 2015-05-07 21:38:06.662182003 -0600 -@@ -20,7 +20,7 @@ NTL_CLIENT; - namespace bernmm { - - --long PowerMod(long a, long ee, long n, double ninv) -+long PowerMod(long a, long ee, long n, wide_double ninv) - { - long x, y; - -@@ -89,7 +89,7 @@ PrimeTable::PrimeTable(long bound) - } - - --long order(long x, long p, double pinv, const Factorisation& F) -+long order(long x, long p, wide_double pinv, const Factorisation& F) - { - // in the loop below, m is always some multiple of the order of x - long m = p - 1; -@@ -113,7 +113,7 @@ long order(long x, long p, double pinv, - - - --long primitive_root(long p, double pinv, const Factorisation& F) -+long primitive_root(long p, wide_double pinv, const Factorisation& F) - { - if (p == 2) - return 1; ---- ./src/sage/rings/bernmm/bern_modp_util.h.orig 2015-02-16 17:15:12.000000000 -0700 -+++ ./src/sage/rings/bernmm/bern_modp_util.h 2015-05-09 08:58:22.618458475 -0600 -@@ -17,6 +17,7 @@ - #include <vector> - #include <cassert> - #include <climits> -+#include <NTL/ZZ.h> - - - #if ULONG_MAX == 4294967295U -@@ -39,7 +40,7 @@ namespace bernmm { - - (Implementation is adapted from ZZ.c in NTL 5.4.1.) - */ --long PowerMod(long a, long ee, long n, double ninv); -+long PowerMod(long a, long ee, long n, NTL::wide_double ninv); - - - /* -@@ -123,13 +124,13 @@ long next_prime(long p); - /* - Computes order of x mod p, given the factorisation F of p-1. - */ --long order(long x, long p, double pinv, const Factorisation& F); -+long order(long x, long p, NTL::wide_double pinv, const Factorisation& F); - - - /* - Finds the smallest primitive root mod p, given the factorisation F of p-1. - */ --long primitive_root(long p, double pinv, const Factorisation& F); -+long primitive_root(long p, NTL::wide_double pinv, const Factorisation& F); - - - }; // end namespace |