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

Commit 3a9756d

Browse files
rwstrwst
committed
Merge branch 'develop' into t/21963/upgrade_to_pynac_0_7_1
2 parents 9521c40 + 163489e commit 3a9756d

File tree

260 files changed

+2179
-2146
lines changed

Some content is hidden

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

260 files changed

+2179
-2146
lines changed

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 7.5.beta4, Release Date: 2016-11-24
1+
SageMath version 7.5.beta5, Release Date: 2016-12-01

‎build/bin/sage-apply-patches

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
#!/usr/bin/env bash
2+
#
3+
# sage-apply-patches [-p<num>] [-d patch-subdir] [patch-dir] -- [...]
4+
#
5+
# Apply any patches to original spkg sources. Patch files must have
6+
# the .patch extension.
7+
#
8+
# By default the patches are applied from ../patches/ using the -p1
9+
# option, and it is assumed that the patches are being applied from
10+
# the root of the package source.
11+
#
12+
# An optional patch subdirectory may be specified with the -d flag.
13+
# For example `sage-apply-patches -d cygwin` applies only those
14+
# patches under <patch-dir>/cygwin.
15+
#
16+
# The -p<num> arg is the argument accepted by the `patch` command,
17+
# and overrides the default -p1
18+
#
19+
# Any additional arguments following " -- " are passed directly
20+
# to the `patch` command.
21+
#
22+
#***************************************************************************
23+
#
24+
# Distributed under the terms of the GNU General Public License (GPL)
25+
# as published by the Free Software Foundation; either version 2 of
26+
# the License, or (at your option) any later version.
27+
# http://www.gnu.org/licenses/
28+
#***************************************************************************
29+
30+
patchdir="../patches"
31+
patch_subdir=""
32+
patch_strip="-p1"
33+
patch_args_sep=""
34+
patch_args="--no-backup-if-mismatch"
35+
36+
while [[ $# > 0 ]]; do
37+
if [[ -z "$patch_args_sep" ]]; then
38+
case $1 in
39+
-d)
40+
patch_subdir="${2%/}"
41+
shift
42+
;;
43+
-p[0-9])
44+
patch_strip="$1"
45+
;;
46+
--)
47+
patch_args_sep="$1"
48+
;;
49+
*)
50+
patchdir="${1%/}"
51+
;;
52+
esac
53+
else
54+
patch_args="$patch_args $1"
55+
fi
56+
57+
shift
58+
done
59+
60+
patchdir="${patchdir}/${patch_subdir}"
61+
patchdir="${patchdir%/}"
62+
patches=( "${patchdir}"/*.patch )
63+
64+
if [[ -r "${patches[0]}" ]]; then
65+
echo "Applying patches from ${patchdir}..."
66+
for patch in ${patches[@]}; do
67+
# Skip non-existing or non-readable patches
68+
[ -r "$patch" ] || continue
69+
echo "Applying $patch"
70+
patch $patch_strip $patch_args < "$patch"
71+
if [ $? -ne 0 ]; then
72+
echo >&2 "Error applying '$patch'"
73+
exit 1
74+
fi
75+
done
76+
else
77+
>&2 echo "No patch files found in $patchdir"
78+
fi

‎build/bin/sage-spkg

+4
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,10 @@ fi
625625

626626
echo "Finished extraction"
627627

628+
cd src
629+
sage-apply-patches || exit 1
630+
cd ..
631+
628632
##################################################################
629633
# The package has been extracted, prepare for installation
630634
##################################################################

‎build/pkgs/arb/spkg-install

-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22

33
cd src
44

5-
for patch in ../patches/*.patch; do
6-
[ -r "$patch" ] || continue # Skip non-existing or non-readable patches
7-
patch -p1 <"$patch"
8-
if [ $? -ne 0 ]; then
9-
echo >&2 "Error applying '$patch'"
10-
exit 1
11-
fi
12-
done
13-
145
# The git head of arb now honors LDFLAGS; The following workaround can
156
# be removed in arb >= 2.8 when it is released
167
export EXTRA_SHARED_FLAGS=$LDFLAGS

‎build/pkgs/atlas/spkg-install

-9
Original file line numberDiff line numberDiff line change
@@ -229,15 +229,6 @@ write_pc_file(['f77blas', 'atlas'], 'blas')
229229
# a custom version of clapack which depends on cblas.
230230
write_pc_file(['lapack', 'f77blas', 'cblas', 'atlas'], 'lapack')
231231

232-
######################################################################
233-
### Patch source
234-
######################################################################
235-
236-
# apply all patches
237-
for fname in glob.glob(os.path.join(PATCH_DIR,'*.patch')):
238-
rc = system_with_flush('patch -p1 -d src/ --input '+os.path.join(PATCH_DIR, fname))
239-
assert_success(rc, bad='Applying '+fname+' failed.', good='Applied '+fname+'.')
240-
241232
# add extra architectural defaults
242233
cp('src/ARCHS/*.tar.bz2', 'src/ATLAS/CONFIG/ARCHS/')
243234

‎build/pkgs/autotools/spkg-install

+1-13
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,7 @@ BUILD=`pwd`/build
3131
# SageMath. See trac #21047.
3232
export M4="$SAGE_LOCAL/bin/m4"
3333

34-
########################################################################
35-
# Apply patch(es)
36-
########################################################################
37-
38-
cd src
39-
for patch in ../patches/*.patch; do
40-
[ -r "$patch" ] || continue # Skip non-existing or non-readable patches
41-
patch -p1 <"$patch"
42-
if [ $? -ne 0 ]; then
43-
echo >&2 "Error applying '$patch'"
44-
exit 1
45-
fi
46-
done
34+
cd "$SRC"
4735

4836
########################################################################
4937
# Remove old installed versions

‎build/pkgs/backports_shutil_get_terminal_size/spkg-install

-9
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,4 @@
22

33
cd src
44

5-
for patch in ../patches/*.patch; do
6-
[ -r "$patch" ] || continue # Skip non-existing or non-readable patches
7-
patch -p1 <"$patch"
8-
if [ $? -ne 0 ]; then
9-
echo >&2 "Error applying '$patch'"
10-
exit 1
11-
fi
12-
done
13-
145
$PIP_INSTALL .

‎build/pkgs/bliss/spkg-install

-8
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ fi
88

99

1010
cd "src"
11-
for patch in ../patches/*.patch; do
12-
[ -r "$patch" ] || continue # Skip non-existing or non-readable patches
13-
patch -p1 <"$patch"
14-
if [ $? -ne 0 ]; then
15-
echo >&2 "Error applying '$patch'"
16-
exit 1
17-
fi
18-
done
1911

2012
./configure --prefix="$SAGE_LOCAL" --disable-gmp && $MAKE && $MAKE install
2113

‎build/pkgs/brial/spkg-install

-8
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ rm -rf "$SAGE_LOCAL"/include/polybori*
1313
rm -rf "$SAGE_LOCAL"/share/polybori
1414

1515
cd src
16-
for patch in ../patches/*.patch; do
17-
[ -r "$patch" ] || continue # Skip non-existing or non-readable patches
18-
patch -p1 <"$patch"
19-
if [ $? -ne 0 ]; then
20-
echo >&2 "Error applying '$patch'"
21-
exit 1
22-
fi
23-
done
2416

2517
# C++11 workaround https://trac.sagemath.org/ticket/20926
2618
export CXXFLAGS="$CXXFLAGS -std=c++98"

‎build/pkgs/bzip2/spkg-install

-10
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,6 @@ export CFLAGS="-O2 -g $CFLAGS"
1919

2020
cd src/src
2121

22-
# Patch bzip2
23-
for patch in ../patches/*.patch; do
24-
[ -r "$patch" ] || continue # Skip non-existing or non-readable patches
25-
patch -p1 <"$patch"
26-
if [ $? -ne 0 ]; then
27-
echo >&2 "Error applying '$patch'"
28-
exit 1
29-
fi
30-
done
31-
3222
# Autotoolify bzip2
3323
cp -r -f ../autotools/* ./
3424

‎build/pkgs/cddlib/patches/lib-src-gmp_Makefile.am.patch ‎build/pkgs/cddlib/patches/build/lib-src-gmp_Makefile.am.patch

File renamed without changes.

‎build/pkgs/cddlib/patches/lib-src_Makefile.am.patch ‎build/pkgs/cddlib/patches/build/lib-src_Makefile.am.patch

File renamed without changes.

‎build/pkgs/cddlib/patches/src-gmp_Makefile.am.patch ‎build/pkgs/cddlib/patches/build/src-gmp_Makefile.am.patch

File renamed without changes.

‎build/pkgs/cddlib/patches/src_Makefile.am.patch ‎build/pkgs/cddlib/patches/build/src_Makefile.am.patch

File renamed without changes.

‎build/pkgs/cddlib/spkg-install

-10
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,6 @@ cp ../patches/random.{c,h} lib-src-gmp/
3232
cp ../patches/cdd_both_reps.c src/
3333
cp ../patches/cdd_both_reps.c src-gmp/cdd_both_reps.c
3434

35-
# apply patch files
36-
for patch in ../patches/*.patch; do
37-
# skip patches that aren't needed at build time
38-
if echo "$patch" | grep 'Makefile.am.patch$' > /dev/null; then
39-
continue
40-
fi
41-
patch -p1 < "$patch" ||
42-
die "Error patching cddlib"
43-
done
44-
4535
# Use newer version of config.guess and config.sub (see Trac #19718)
4636
cp "$SAGE_ROOT"/config/config.* .
4737

‎build/pkgs/cephes/spkg-install

-11
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,8 @@ if [ "$UNAME" != "FreeBSD" ]; then
1111
exit 0
1212
fi
1313

14-
CUR=`pwd`
1514
cd src
1615

17-
# Apply patches:
18-
echo "Applying patches (if any)..."
19-
for patch in ../patches/*.patch; do
20-
patch -p1 <"$patch"
21-
if [ $? -ne 0 ]; then
22-
echo >&2 "Patch '$patch' failed to apply."
23-
exit 1
24-
fi
25-
done
26-
2716
echo "Building Cephes..."
2817
$MAKE
2918
if [ $? -ne 0 ]; then

‎build/pkgs/cliquer/spkg-install

-12
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,6 @@ fi
88

99
cd src
1010

11-
echo "Applying patches..."
12-
# Apply all patches
13-
for patch in ../patches/*.patch; do
14-
[ -r "$patch" ] || continue # Skip non-existing or non-readable patches
15-
echo "Applying $patch"
16-
patch -p1 <"$patch"
17-
if [ $? -ne 0 ]; then
18-
echo >&2 "Error applying '$patch'"
19-
exit 1
20-
fi
21-
done
22-
2311
echo "Configuring..."
2412
./configure --prefix="$SAGE_LOCAL" --disable-static --libdir="$SAGE_LOCAL/lib"
2513
if [ $? -ne 0 ]; then

‎build/pkgs/cmake/spkg-install

-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22

33
cd src
44

5-
for patch in ../patches/*.patch; do
6-
[ -r "$patch" ] || continue # Skip non-existing or non-readable patches
7-
patch -p1 <"$patch"
8-
if [ $? -ne 0 ]; then
9-
echo >&2 "Error applying '$patch'"
10-
exit 1
11-
fi
12-
done
13-
145
system_curl=""
156

167
if [ "$UNAME" = "Darwin" ]; then

‎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=d53b6f5029d8c3233295fa4acd7725f057407226
3-
md5=dcd52bb9ccacb31e699c3e1719b2b14b
4-
cksum=3124107221
2+
sha1=3029fd9073df3ef509b6bfcdd444eb8e64fd8e43
3+
md5=56bbebf050b6e795969f78c0cbf34c60
4+
cksum=1121692794

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
193
1+
194

‎build/pkgs/coxeter3/spkg-install

-8
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ cd ../src
1616
cp ../patches/directories.tmpl directories.h
1717
cp ../patches/sage.cpp ../patches/sage.h .
1818
cp ../patches/test.input ../patches/test.output.expected .
19-
for patch in ../patches/*.patch; do
20-
[ -r "$patch" ] || continue # Skip non-existing or non-readable patches
21-
patch -p1 <"$patch"
22-
if [ $? -ne 0 ]; then
23-
echo >&2 "Error applying '$patch'"
24-
exit 1
25-
fi
26-
done
2719

2820
# Build
2921
$MAKE all

‎build/pkgs/cvxopt/spkg-install

-9
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,6 @@ fi
88

99
cd src
1010

11-
# Apply patches.
12-
for patch in ../patches/*.patch; do
13-
patch -p1 <"$patch"
14-
if [ $? -ne 0 ]; then
15-
echo >&2 "Error applying '$patch'"
16-
exit 1
17-
fi
18-
done
19-
2011
# Normally for a 64-bit build the -m64 option is added to
2112
# gcc, but other compilers will not accept that, so
2213
# allow it to be configured as something different if need

‎build/pkgs/cysignals/spkg-install

-9
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,6 @@ fi
88

99
cd src
1010

11-
for patch in ../patches/*.patch; do
12-
[ -r "$patch" ] || continue # Skip non-existing or non-readable patches
13-
patch -p1 <"$patch"
14-
if [ $? -ne 0 ]; then
15-
echo >&2 "Error applying '$patch'"
16-
exit 1
17-
fi
18-
done
19-
2011
if [ "$SAGE_DEBUG" = yes ]; then
2112
CYSIGNALS_CONFIGURE="--enable-debug $CYSIGNALS_CONFIGURE"
2213
fi

‎build/pkgs/cython/spkg-install

-11
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,6 @@ fi
88

99
cd src
1010

11-
# Apply patches. See SPKG.txt for information about what each patch
12-
# does.
13-
for patch in ../patches/*.patch; do
14-
[ -r "$patch" ] || continue # Skip non-existing or non-readable patches
15-
patch -p1 <"$patch"
16-
if [ $? -ne 0 ]; then
17-
echo >&2 "Error applying '$patch'"
18-
exit 1
19-
fi
20-
done
21-
2211
$PIP_INSTALL .
2312

2413
if [ $? -ne 0 ]; then

‎build/pkgs/dot2tex/spkg-install

-9
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,6 @@ fi
88

99
cd src
1010

11-
for patch in ../patches/*.patch; do
12-
[ -f "$patch" ] || continue
13-
patch -p1 <"$patch"
14-
if [ $? -ne 0 ]; then
15-
echo >&2 "Error applying '$patch'"
16-
exit 1
17-
fi
18-
done
19-
2011
$PIP_INSTALL .
2112

2213
if [ $? -ne 0 ]; then

‎build/pkgs/ecl/spkg-install

-11
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,6 @@ fi
88

99
cd src
1010

11-
# Patch sources. Note that some patches (in the patches/src directory)
12-
# have been applied to the source tarball.
13-
for patch in ../patches/*.patch; do
14-
[ -r "$patch" ] || continue # Skip non-existing or non-readable patches
15-
patch -p1 <"$patch"
16-
if [ $? -ne 0 ]; then
17-
echo >&2 "Error applying '$patch'"
18-
exit 1
19-
fi
20-
done
21-
2211
if [ -z "$CFLAG64" ] ; then
2312
CFLAG64=-m64
2413
fi

0 commit comments

Comments
 (0)