Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 0e1162b

Browse files
behacklbehackl
committed
Merge tag '7.1.beta1' into symbolics/stieltjes-constants
Sage version 7.1.beta1
2 parents bdac71f + 2505dbc commit 0e1162b

File tree

674 files changed

+36884
-10998
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

674 files changed

+36884
-10998
lines changed

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Sage version 7.0.beta3, released 2016-01-06
1+
Sage version 7.1.beta1, released 2016-01-28

‎build/pkgs/atlas/configuration.py

+4-6
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ def close(self):
161161

162162
conf['generic_binary?'] = (os.environ.get('SAGE_FAT_BINARY', 'no') == 'yes')
163163

164+
conf['user'] = os.environ.get('ATLAS_CONFIGURE', '')
165+
164166
######################################################################
165167
### bit width
166168
######################################################################
@@ -253,9 +255,5 @@ def close(self):
253255
######################################################################
254256

255257
print("Configuration:")
256-
for key, value in conf.items():
257-
print(' '+str(key)+': '+str(value))
258-
259-
260-
261-
258+
for k in sorted(conf, key=str.lower):
259+
print(' {}: {}'.format(k, conf[k]))

‎build/pkgs/atlas/spkg-install

+4
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,10 @@ def configure(arch=None, isa_ext=None):
346346
isa_extension = sum(1 << ATLAS_ISAEXT.index(x) for x in isa_ext)
347347
cmd += ' -V '+str(isa_extension)
348348

349+
# Custom configure options
350+
if conf['user']:
351+
cmd += " " + conf['user']
352+
349353
rc = system_with_flush(cmd)
350354
make_check_enums()
351355
return rc

‎build/pkgs/cliquer/SPKG.txt

+1-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,4 @@ http://users.tkk.fi/pat/cliquer.html
1616
* None
1717

1818
== Patches ==
19-
* Makefile.patch: Patch the Makefile for Sage. Remove hardcoded
20-
compiler and linker flags, allow flags to be set from spkg-install.
21-
More importantly, we're building cliquer as a dynamic shared library,
22-
instead of a stand-alone program.
19+
* autotoolized - see https://github.com/dimpase/autocliquer

‎build/pkgs/cliquer/checksums.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tarball=cliquer-VERSION.tar.bz2
2-
sha1=8239530eb14c1273c32ffcf3b671dd3766084374
3-
md5=32b97b6689318b58d9c099e2c7769521
4-
cksum=3641271864
1+
tarball=cliquer-VERSION.tar.gz
2+
sha1=930ec79f64facb8ac4035a3e3702ed2b1dabd092
3+
md5=1d985e0bed876cc69aed43953a814a6a
4+
cksum=766312376

‎build/pkgs/cliquer/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.21.p2
1+
1.21.p3

‎build/pkgs/cliquer/patches/Makefile.patch

-46
This file was deleted.

‎build/pkgs/cliquer/spkg-check

+10-27
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,18 @@
11
#!/usr/bin/env bash
22

3-
if [ "$SAGE_LOCAL" = "" ]; then
4-
echo "SAGE_LOCAL undefined ... exiting";
5-
echo "Maybe run 'sage -sh'?"
3+
if [ -z "$SAGE_LOCAL" ]; then
4+
echo >&2 "Error: SAGE_LOCAL undefined - exiting..."
5+
echo >&2 "Maybe run 'sage -sh'?"
66
exit 1
77
fi
88

9-
OPTIMIZATION_FLAGS="-O3 -funroll-loops -fomit-frame-pointer"
10-
# Work around a bug in gcc 4.6.0: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48774
11-
if [ "`testcc.sh $CC`" = GCC ] ; then
12-
if $CC -dumpversion 2>/dev/null |grep >/dev/null '^4\.6\.[01]' ; then
13-
echo "Warning: Working around bug in gcc 4.6.0"
14-
OPTIMIZATION_FLAGS="$OPTIMIZATION_FLAGS -fno-ivopts"
15-
fi
16-
fi
17-
18-
CFLAGS="$CFLAGS `testcflags.sh -g $OPTIMIZATION_FLAGS -fPIC -KPIC -Wall`"
19-
CPPFLAGS="$CPPFLAGS -I$SAGE_LOCAL/include"
20-
LDFLAGS="$LDFLAGS -L$SAGE_LOCAL/lib"
9+
cd src
2110

22-
# Compile for 64-bit if SAGE64 is set to 'yes'.
23-
# On 64-bit hardware, we don't need to set this variable to true. A
24-
# 64-bit cliquer library would be built on such platform.
25-
if [ "$SAGE64" = yes ]; then
26-
CFLAGS="$CFLAGS -m64 "
27-
LDFLAGS="$LDFLAGS -m64 "
11+
echo "Now building and running cliquer's test suite..."
12+
$MAKE check
13+
if [ $? -ne 0 ]; then
14+
echo >&2 "Error: The cliquer's test suite failed."
15+
exit 1
2816
fi
2917

30-
# Export everything
31-
export CFLAGS
32-
export CPPFLAGS
33-
export LDFLAGS
34-
35-
cd src && $MAKE test
18+
echo "The cliquer's test suite passed successfully."

‎build/pkgs/cliquer/spkg-install

+14-49
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,14 @@
11
#!/usr/bin/env bash
22

3-
OPTIMIZATION_FLAGS="-O3 -funroll-loops -fomit-frame-pointer"
4-
# Work around a bug in gcc 4.6.0: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48774
5-
if [ "`testcc.sh $CC`" = GCC ] ; then
6-
if $CC -dumpversion 2>/dev/null |grep >/dev/null '^4\.6\.[01]' ; then
7-
echo "Warning: Working around bug in gcc 4.6.0"
8-
OPTIMIZATION_FLAGS="$OPTIMIZATION_FLAGS -fno-ivopts"
9-
fi
10-
fi
11-
12-
CFLAGS="$CFLAGS `testcflags.sh -g $OPTIMIZATION_FLAGS -fPIC -KPIC -Wall`"
13-
CPPFLAGS="$CPPFLAGS -I$SAGE_LOCAL/include"
14-
15-
# Compile for 64-bit if SAGE64 is set to 'yes'.
16-
# On 64-bit hardware, we don't need to set this variable to true. A
17-
# 64-bit cliquer library would be built on such platform.
18-
if [ "$SAGE64" = yes ]; then
19-
echo "Building a 64-bit version of cliquer"
20-
CFLAGS="$CFLAGS -m64 "
21-
LDFLAGS="$LDFLAGS -m64 "
22-
fi
23-
24-
# Flags for building a dynamically linked shared object.
25-
if [ "$UNAME" = "Darwin" ]; then
26-
SAGESOFLAGS="-dynamiclib -single_module -flat_namespace -undefined dynamic_lookup"
27-
elif [ "$UNAME" = "SunOS" ]; then
28-
SAGESOFLAGS="-shared -Wl,-h,libcliquer.so -Wl,-ztext"
29-
else
30-
SAGESOFLAGS="-shared -Wl,-soname,libcliquer.so"
3+
if [ -z "$SAGE_LOCAL" ]; then
4+
echo >&2 "SAGE_LOCAL undefined - exiting..."
5+
echo >&2 "Maybe run 'sage -sh'?"
6+
exit 1
317
fi
328

33-
# Export everything
34-
export CFLAGS
35-
export CPPFLAGS
36-
export LDFLAGS
37-
export SAGESOFLAGS
38-
399
cd src
4010

11+
echo "Applying patches..."
4112
# Apply all patches
4213
for patch in ../patches/*.patch; do
4314
[ -r "$patch" ] || continue # Skip non-existing or non-readable patches
@@ -49,22 +20,16 @@ for patch in ../patches/*.patch; do
4920
fi
5021
done
5122

52-
$MAKE
23+
echo "Configuring..."
24+
./configure --prefix="$SAGE_LOCAL" --disable-static --libdir="$SAGE_LOCAL/lib"
5325
if [ $? -ne 0 ]; then
54-
echo >&2 "Failed to compile cliquer"
55-
exit 1
26+
echo >&2 "Error configuring cliquer"
27+
exit 1
5628
fi
5729

58-
rm -rf "$SAGE_LOCAL/include/cliquer/"
59-
mkdir -p "$SAGE_LOCAL/include/cliquer/"
60-
cp *.h "$SAGE_LOCAL/include/cliquer/"
61-
62-
if [ "$UNAME" = "Darwin" ]; then
63-
cp -f libcliquer.so "$SAGE_LOCAL/lib/libcliquer.dylib"
64-
install_name_tool -id "${SAGE_LOCAL}"/lib/libcliquer.dylib "${SAGE_LOCAL}"/lib/libcliquer.dylib
65-
elif [ "$UNAME" = "CYGWIN" ]; then
66-
cp -f libcliquer.so "$SAGE_LOCAL/lib/libcliquer.dll"
30+
echo "Building and installing ..."
31+
$MAKE install
32+
if [ $? -ne 0 ]; then
33+
echo >&2 "Error installing cliquer"
34+
exit 1
6735
fi
68-
69-
# Copy this in all cases, in any case it doesn't hurt.
70-
cp -f libcliquer.so "$SAGE_LOCAL/lib/libcliquer.so"

‎build/pkgs/cliquer/spkg-src

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/sh
2+
#
3+
# creates the tarball in the current dir, to be moved to ../../../upstream
4+
5+
#PATCHLEVEL=".p0"
6+
PATCHLEVEL=
7+
8+
rm -rf autocliquer/
9+
git clone https://github.com/dimpase/autocliquer.git
10+
cd autocliquer/
11+
12+
VERSION=`autoconf --trace='AC_INIT:$2'`
13+
autoreconf -fi
14+
automake --add-missing --copy
15+
./configure
16+
17+
rm -f cliquer-$VERSION.tar.gz
18+
make dist
19+
mv cliquer-$VERSION.tar.gz ../
20+
cd ..
21+
rm -rf autocliquer/
22+
23+

‎build/pkgs/configure/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=740a26d4dab56b5a88fa0e886c9bbed931d6a961
3-
md5=4d3f1282f9db5dab064822b856b86e99
4-
cksum=3179103806
2+
sha1=667c4449d5d193a6520ad38cf9c0f49e209cbc21
3+
md5=de3e80d1d278a05e430669fd8beefa19
4+
cksum=3190707453

‎build/pkgs/configure/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
137
1+
142

‎build/pkgs/cryptominisat/type

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
optional
1+
experimental

‎build/pkgs/flint/patches/use_ldflags_in_tests.patch

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
Use LDFLAGS for tests, too
2+
3+
Upstream PR: https://github.com/wbhart/flint2/pull/209
4+
5+
6+
--- a/Makefile.in 2016-01-09 01:44:52.178779543 +0100
7+
+++ b/Makefile.in 2016-01-09 01:44:19.874183406 +0100
8+
@@ -227,7 +227,7 @@
9+
$(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@;
10+
11+
build/test/%$(EXEEXT): test/%.c $(HEADERS) | build/test
12+
- $(QUIET_CC) $(CC) $(CFLAGS) $(INCS) $< -o $@ $(LIBS)
13+
+ $(QUIET_CC) $(CC) $(CFLAGS) $(INCS) $(LDFLAGS) $< -o $@ $(LIBS)
14+
15+
build/test:
16+
mkdir -p build/test
17+
@@ -242,7 +242,7 @@
18+
$(QUIET_CXX) $(CXX) $(CXXFLAGS) $(INCS) -c $< -o $@
19+
20+
build/interfaces/test/t-NTL-interface$(EXEEXT): interfaces/test/t-NTL-interface.cpp build/interfaces/NTL-interface.o
21+
- $(QUIET_CXX) $(CXX) $(CXXFLAGS) $(INCS) $< build/interfaces/NTL-interface.o -o $@ $(LIBS)
22+
+ $(QUIET_CXX) $(CXX) $(CXXFLAGS) $(INCS) $(LDFLAGS) $< build/interfaces/NTL-interface.o -o $@ $(LIBS)
23+
24+
print-%:
25+
@echo '$*=$($*)'

‎build/pkgs/flint/spkg-check

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [ "$SAGE_LOCAL" = "" ]; then
1313
fi
1414

1515
cd src
16-
$MAKE check
16+
$MAKE check AT= QUIET_CC= QUIET_CXX= QUIET_AR=
1717

1818
if [ $? -ne 0 ]; then
1919
echo >&2 "Error: FLINT failed to pass its test suite."

‎build/pkgs/flint/spkg-install

+10-10
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ fi
2626

2727
cd src
2828

29-
#echo "Patching FLINT."
30-
#for patch in ../patches/*.patch; do
31-
# [ -f "$patch" ] || continue
32-
# patch -p1 <"$patch"
33-
# if [ $? -ne 0 ]; then
34-
# echo >&2 "Error applying '$patch'"
35-
# exit 1
36-
# fi
37-
#done
29+
echo "Patching FLINT."
30+
for patch in ../patches/*.patch; do
31+
[ -f "$patch" ] || continue
32+
patch -p1 <"$patch"
33+
if [ $? -ne 0 ]; then
34+
echo >&2 "Error applying '$patch'"
35+
exit 1
36+
fi
37+
done
3838

3939
echo "Configuring FLINT."
4040
./configure \
@@ -50,7 +50,7 @@ if [ $? -ne 0 ]; then
5050
fi
5151

5252
echo "Building FLINT shared library."
53-
$MAKE
53+
$MAKE verbose
5454
if [ $? -ne 0 ]; then
5555
echo >&2 "Error: Failed to build FLINT shared library."
5656
exit 1

‎build/pkgs/gp2c/checksums.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=gp2c-VERSION.tar.gz
2-
sha1=5acb1a13e1ed8ee877ffb34baa3b817e720f3e50
3-
md5=cb263990e399153aca6a2540930b4600
4-
cksum=1931194041
2+
sha1=e07cebffcd09c0d644d52335130984f33042b46f
3+
md5=3f6bb47d41ddca7b6a4938d16abbe4e8
4+
cksum=3338275717

‎build/pkgs/gp2c/package-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.0.9pl3
1+
0.0.9pl5

0 commit comments

Comments
 (0)