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

Commit bb4630f

Browse files
committed
Merge branch 'develop' into t/20939/remove_pexpect_maxima_in_ymn-20939
2 parents 04f79cd + a4df481 commit bb4630f

File tree

821 files changed

+25955
-7617
lines changed

Some content is hidden

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

821 files changed

+25955
-7617
lines changed

.dir-locals.el

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
;;; Directory Local Variables
2+
;;; For more information see (info "(emacs) Directory Variables")
3+
4+
((nil
5+
;; Use space instead of tabs for indentation
6+
(indent-tabs-mode . nil))
7+
(makefile-mode
8+
;; But use tabs in Makefiles
9+
(indent-tabs-mode . t)))

COPYING.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ free open source license as defined at http://www.opensource.org/.
88
The whole Sage software distribution is licensed under the General
99
Public License, version 3 (no other versions!).
1010

11+
All Sage documentation is licensed under Creative Commons 3.0 BY-SA
12+
License.
13+
1114
Some of the code available in *optional* Sage packages (not included
1215
in sage-*.tar) are licensed under more restrictive conditions.
1316

VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 7.5.beta2, Release Date: 2016-11-09
1+
SageMath version 7.5.rc0, Release Date: 2016-12-18

build/bin/sage-apply-patches

Lines changed: 78 additions & 0 deletions
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

Lines changed: 4 additions & 0 deletions
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/make/deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
###############################################################################
1+
## -*- Makefile -*- ###########################################################
22
# This file ($SAGE_ROOT/build/make/deps) will be copied into
33
# $SAGE_ROOT/build/make/Makefile by $SAGE_ROOT/build/make/install
44
###############################################################################

build/pkgs/arb/spkg-install

Lines changed: 0 additions & 9 deletions
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
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.10.2.p2
1+
3.10.2.p3

build/pkgs/atlas/spkg-install

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -223,20 +223,11 @@ if 'SAGE_ATLAS_LIB' in os.environ:
223223

224224
sys.exit(0)
225225

226-
write_pc_file(['cblas', 'atlas'], 'cblas')
227-
write_pc_file(['f77blas', 'atlas'], 'blas')
228-
# The inclusion of cblas is not a mistake. ATLAS' lapack include
229-
# a custom version of clapack which depends on cblas.
230-
write_pc_file(['lapack', 'f77blas', 'cblas', 'atlas'], 'lapack')
231-
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+'.')
226+
# Because blas, cblas and lapack libraries are properly linked
227+
# with no unknown symbols, no extra libraries needs to be given.
228+
write_pc_file(['cblas'], 'cblas')
229+
write_pc_file(['f77blas'], 'blas')
230+
write_pc_file(['lapack'], 'lapack')
240231

241232
# add extra architectural defaults
242233
cp('src/ARCHS/*.tar.bz2', 'src/ATLAS/CONFIG/ARCHS/')

build/pkgs/autotools/SPKG.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,5 @@ spkg. If you edit this, you must update Makefile.build using the
6161
spkg-write-makefile script. After optionally updating the git repos
6262
using spkg-src, you need to run
6363
./spkg-write-makefile >Makefile.build
64-
This must be run in a Sage shell, with the the autotools spkg
64+
This must be run in a Sage shell, with the autotools spkg
6565
installed.

0 commit comments

Comments
 (0)