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

Commit

Permalink
Merge branch 'develop' into t/18386/18386-2
Browse files Browse the repository at this point in the history
  • Loading branch information
rwst committed May 25, 2017
2 parents 51aeae3 + c011cfa commit 074034a
Show file tree
Hide file tree
Showing 521 changed files with 15,320 additions and 13,248 deletions.
16 changes: 3 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -377,20 +377,10 @@ do.

sage --sdist

2. To make a binary distribution with your currently installed packages,
type:
The result is placed in the directory "$SAGE_ROOT/dist/".

sage --bdist

3. To make a binary that will run on the widest range of target
machines, set the SAGE_FAT_BINARY environment variable to "yes"
before building Sage:

export SAGE_FAT_BINARY="yes"
make distclean && make
./sage --bdist

In all cases, the result is placed in the directory "$SAGE_ROOT/dist/".
2. To make a binary distribution with your currently installed packages,
visit https://github.com/sagemath/binary-pkg


Changes to Included Software
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 8.0.beta5, Release Date: 2017-05-04
SageMath version 8.0.beta8, Release Date: 2017-05-24
7 changes: 7 additions & 0 deletions build/bin/sage-spkg
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,13 @@ else
fi
fi

if [ "$UNAME" = "CYGWIN" ]; then
# Rebase after installing each package--in case any packages load this
# package at build time we need to ensure during the build that no binaries
# have conflicting address spaces
sage-rebase.sh "$SAGE_LOCAL" 2>/dev/null
fi

echo "Successfully installed $PKG_NAME"

if [ "$SAGE_CHECK" = "yes" ]; then
Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=339f2474b789d33051dde8f69d047ae723a36379
md5=9bb01c255b39648bb19f62a3fa24a80d
cksum=2072910001
sha1=d19b80dca421a261fd1cf19be8c861aef46d403b
md5=5cfae5d5a32e87c9fff3215773b56dc8
cksum=133013502
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
219
222
5 changes: 1 addition & 4 deletions build/pkgs/conway_polynomials/dependencies
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
| $(SAGERUNTIME)

CONWAY_POLYNOMIALS depends on SAGERUNTIME because it runs Sage code to
generate a Sage object (.sobj).
$(PYTHON) $(inst_six)

----------
All lines of this file are ignored except the first.
Expand Down
5 changes: 2 additions & 3 deletions build/pkgs/conway_polynomials/spkg-install
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#!/usr/bin/env python
#!/usr/bin/env sage-python23
import os
from six.moves import cPickle as pickle
from sage.env import SAGE_SHARE

SAGE_SHARE = os.getenv('SAGE_SHARE')
install_root = os.path.join(SAGE_SHARE, 'conway_polynomials')


def create_db():
db = {}
from src import conway_polynomials
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/coxeter3/patches/test.output.expected
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
This is Coxeter version 3.0_beta2.
This is Coxeter version 3.1.sage.
Enter help if you need assistance, carriage return to start the program.

coxeter :
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/cython/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.25.2.p1
0.25.2.p2
32 changes: 32 additions & 0 deletions build/pkgs/cython/patches/cdef_public_dll_linkage.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Patch for https://github.com/cython/cython/pull/1687
Only needed for Cygwin systems

commit 632f18f2710eaf6ee2b3a3aaa0749c7886299e64
Author: Jeroen Demeyer <jdemeyer@cage.ugent.be>
Date: Thu Apr 27 17:13:39 2017 +0200

Do not use special dll linkage for "cdef public" functions

diff --git a/Cython/Compiler/ModuleNode.py b/Cython/Compiler/ModuleNode.py
index 6356e78..76fe4e5 100644
--- a/Cython/Compiler/ModuleNode.py
+++ b/Cython/Compiler/ModuleNode.py
@@ -214,8 +214,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
def generate_public_declaration(self, entry, h_code, i_code):
h_code.putln("%s %s;" % (
Naming.extern_c_macro,
- entry.type.declaration_code(
- entry.cname, dll_linkage="DL_IMPORT")))
+ entry.type.declaration_code(entry.cname)))
if i_code:
i_code.putln("cdef extern %s" % (
entry.type.declaration_code(entry.cname, pyrex=1)))
@@ -2849,7 +2848,7 @@ def generate_cfunction_declaration(entry, env, code, definition):
dll_linkage = "DL_IMPORT"
elif entry.visibility == 'public':
storage_class = Naming.extern_c_macro
- dll_linkage = "DL_EXPORT"
+ dll_linkage = None
elif entry.visibility == 'private':
storage_class = "static"
dll_linkage = None
9 changes: 3 additions & 6 deletions build/pkgs/ecm/SPKG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,9 @@ LGPL V3+
"-mcpu=...", and perhaps pass a more generic "--host=..." to
'configure'. (MPIR honors '--enable-fat' to some extent, but this
option isn't used on anything other than x86 / x86_64.)
* We currently work around a linker bug on MacOS X 10.5 PPC (with
GCC 4.2.1) which breaks 'configure' if debug symbols are enabled.
This *might* get fixed in later upstream releases.
* We could save some space by removing the `src/build.vc10/` directory which
isn't used in Sage. (It gets probably more worth in case also directories /
files for later versions of Microsoft Visual C get added.)

=== Patches ===
* asm-align.patch: on OS X using Xcode 7, ".align 64" in the files
"x86_64/mulredc*.asm" causes an error, and similarly with ".align
32,,16". These need to be changed to ".p2align 6" and ".p2align
5,,4", respectively
8 changes: 4 additions & 4 deletions build/pkgs/ecm/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=ecm-VERSION.tar.bz2
sha1=97a6f9fc68337d8dadebc4754a61fdfe97bb0136
md5=6d70cd667b46e34080615ae361608fa7
cksum=134247046
tarball=ecm-VERSION.tar.gz
sha1=407e41af6f93214509810b954b88251e4b89e82b
md5=559b13454b2094fbf26b33ff4fc824b7
cksum=3785569195
2 changes: 1 addition & 1 deletion build/pkgs/ecm/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.4.4.p0
7.0.4.p0
Loading

0 comments on commit 074034a

Please sign in to comment.