Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

5.4rc1: now compiling here - yeah!

(Portage version: 2.2.0_alpha135/git/Linux x86_64, unsigned Manifest commit)
  • Loading branch information...
commit 6344ff725b5a2489e083cea881bf75e83e595716 1 parent dc9cd9b
@kiwifb kiwifb authored
View
5 sci-mathematics/sage/ChangeLog
@@ -3,6 +3,11 @@
# $Header: $
08 Oct 2012; François Bissey <francois.bissey@canterbury.ac.nz>
+ sage-5.4_rc1.ebuild, +files/sage-5.4-package.patch,
+ +files/sage-5.4-singular_extra.patch:
+ make it compile
+
+ 08 Oct 2012; François Bissey <francois.bissey@canterbury.ac.nz>
sage-5.4_rc1.ebuild, +files/sage-5.4-SAGE_ROOT.patch,
+files/sage-5.4-fix-SAGE_LOCAL.patch, +files/sage-5.4-fix-qepcad-path.patch,
+files/sage-5.4-misc.patch:
View
6 sci-mathematics/sage/Manifest
@@ -12,7 +12,9 @@ AUX sage-5.4-SAGE_ROOT.patch 1239 SHA256 9fffae354cb513e7aa7bf3b19142a192f789a62
AUX sage-5.4-fix-SAGE_LOCAL.patch 4468 SHA256 510184d11ac30f05265df4096980611632947a0d58cef57730e6d3210647b826 SHA512 7567e565afe8ff9d8d63c9e5e09e3b3e50260de92249d4764abf911691327c5e8a80297119a6d03d40afae84b40991d2cf6fc16fe4be2be9b31f31c4f7a888ba WHIRLPOOL 4134c5254591de88bf7c00f33d40cd4cc5c5dddc14dde6dfa8d590282a11511a996adac6f4ec9f2b14d69d3874181ec599fad92e017afe7dd60561ccb66e902e
AUX sage-5.4-fix-qepcad-path.patch 1345 SHA256 9d88ccc60ade84fa70f3f83ed8ed1890a7067927fc54915abcab75c52eecaa13 SHA512 e28b24bad8eba04c0c385157ffdb6b88f4fa093b9109874536430cebefa031fca1000b204e3e9e322821013aa2408545953a5c23156c726aa84104b5f80827b5 WHIRLPOOL bde8aa4d9ffb723d95014d9c173a555fbe8f8ae481061a8506dadc89e22a64cbde534bfd1a57589fc7f4c24ed0071b9111e8bcd2d15e60f7ddd337ae5e575c23
AUX sage-5.4-misc.patch 1515 SHA256 927a9a34cf629e6aebf3a4f1c12f433d8945e1b5290c7cc26c324b6b5981ba83 SHA512 7efb07df28d1fcc8b00e6aca2bd12ca3638ced3eb264390d5256f2034839033e1bca5e9f0ba0c873d21367071ea43da62eebe5e3f4b895f1e6b959746c55b02e WHIRLPOOL 5d0b8e0a0e5eb66eaeb565a09c8229d8a0bdaa8075207800ade69a0ba153aeca19f439f65f5a8fa507d0cbd9c378e1cb480de22d2b48d8ee9fae9cfe944d6513
+AUX sage-5.4-package.patch 338 SHA256 7e5e92555ccc8ade138abc3ad7a2025d8e3a7f1f33f8b5949ea628dcd4b1853a SHA512 279824637ceb634d5d4ecc15c824ced2febec02a268c34352754260312808bee2d288f2f16ed3ef5473f9d1a1d41aa7223147f05c131a19c1718c2362b827eaf WHIRLPOOL 7fc64f24c9329dc4db4d47d04b7417e78c045297a489363d20c0e728d0317801e853d0e3a551333dfd35b1a3e0d5a29b3c684d59e39941f528a35691f27c997a
AUX sage-5.4-plural.patch 690 SHA256 1e3fa9cb7a851fd1cca37b0efd3e771bb8831f88215f9c1296d82fd44bfb5aa8 SHA512 759b34fe39424c3f7b24276c40a9650d41ea6bca22337562a8a3e207e62eaf80f8f6e3e0e254aac387911ceb65b02ae12a1076c84ad2a290cccafa7505f6fc41 WHIRLPOOL bf72463642ed717a823db5b9680b021de2375a76a9d6d15ed19ecf2eaf1a7a38b25e3d1138fb8d53b0a0f3ee7e357bae34e22c153c2cc59fab2beb70733a22d6
+AUX sage-5.4-singular_extra.patch 4286 SHA256 057f16f5e84e1431b311bb15eef3af95a0c571868495ae2099a09694ffb09d48 SHA512 f259447fbc382820054a7684b4f34ad7891e4bcf388f96949843dba72ea24557bb759c81567f10f7628a1a4cbbe11d3a6a6397a2ae7e403fbdbe8a7ef5e64633 WHIRLPOOL 837e0e3c2e12faf44a1328928c57cbaf4d31f6f82652e297892c8fdfc978e0da0e448f94abc099f5743f93161bfbe9a4c0048db1fa44eda12251adf6c569547a
AUX trac11395-fix_tutorial.patch 3979 SHA256 6d8a3931cb7054421cd621eab6cc7712a9917ae324958e3726c1a345b888706d SHA512 71646588a1e6b824cf867eeffd3ac169a3d9e35a837ac56e744ba5653e8f8b100a892f9f5c791c6ce3516b16828db33ef1ae4110bb242e91520a6464b4dd40fa WHIRLPOOL bc77b39129dff063d4cdf48c8ca1c095d4903f744a88147a9c30966b74e24d6d8cc1fb4e2b9be174131f9e067c274591b98445c5f38b8ed9e412588a817783dc
AUX trac12985-unicode.patch 3463 SHA256 47e5556e2dcba4cfd79745788e60e2d857c50ed4b25511927b07b4f5754070f8 SHA512 adb5688a55132a6a499400b9145be96472707eeee01158c4f5352a280d158c3ee137534bf03490ecaedf2ab3963d68ab02daadac2a4625eac19fdcbb73daf01e WHIRLPOOL bd7ed379cde2e610c9d2c38c0258328d5fb2b4cff5e43d424478c8b92f0949f7150a8bf863eb9f49fa0449f05580634d2eed700ad1c52ed5c84618e1206bd51a
AUX trac_10764-fix-gen_interpreters_doctest.patch 775 SHA256 e53f0eed4a7f77267a96597a8c0ecc70ff736ad2fdff434319a7b9ad19ce8c33 SHA512 49a848750e2ef7e16a4fa686ffd3569fea6cf6b8e1a7931f684ae1ead105d8ba8f6eea04b40f2391ce46da5c70ccc0e8d590e7dd6c66c88479da9af33bce27c6 WHIRLPOOL 9b517b11fb4bb7a442f1586902f2f548015b924c50f66a0e733e95e46b35d31e20b1e5fc82363881a0c1aaaee5fc95b6ee3ec200265e28157449da508113cb3a
@@ -26,6 +28,6 @@ DIST sage-5.4_rc1.tar.bz2 57936735 SHA256 1b57e3ad592775c2ac73738d98b3301e555765
EBUILD sage-5.1-r2.ebuild 13106 SHA256 87eba03eb9518d4c6417551a271f5476164d9fa9b1408bb73d1e32e318fcd6d1 SHA512 9d91cfd259d6eff88ff513db4a59dc11ead47d2610804697c766097110511d6fb6fa45144352fb0aa2f29dffbf5fd4b3c21cb2462b8f4be5b1dd7a4ddcf8781e WHIRLPOOL 1661e9f68a51615dec9165422368c4f4b5c8fa22362e63e86ffd9846062d99d817e34d29c483db017b45b9f677afa1635b0ac0b41c03b91eef471253a01a0c3c
EBUILD sage-5.2-r2.ebuild 12795 SHA256 17aac628818f5a5c1a9eac0dd1c85fbfdffca58bf3e1f2a0a4132e577fd88577 SHA512 09e3b4598e3d8cd470f5f5596b471d071c271a6b09a0098bc52b0320895c6db67758c84a8880447eacf5d2b20af5b2cf9ea148ddd05f77c15d8c2ad2305f0c98 WHIRLPOOL 9589c0361970b94748363a88783161f9048bc95d1eef78feab090c190699e2d2d71f1283801b3aa692fd3bee418d096ca2d48a22e8dca0b44bfe67c6274ef0e3
EBUILD sage-5.3.ebuild 12412 SHA256 66acba320b0880c5fce4946ae6906d07506e49f25e606c08649cc62996d55d29 SHA512 5c65d0e7219e605c07bf89e7ca3234c278525c9c95b90033ff9073c984ff0ec7e03abeefa3f3128cf5130ebcc5afffdaca3eaffd505f7d46927108b6df8b7037 WHIRLPOOL 227416b9d897de19b41f066b450f9e8a773ef1c715c6997b270dc76ec1fbbb8b1525a1d3c8bd35e25c4dbae88eabb0baf98afecb9788bdb651d9cd7a58b60c9b
-EBUILD sage-5.4_rc1.ebuild 12273 SHA256 e158acba9cadf5a3555f1faac85c7c4229b04792c83403535bf45b9c4dc19c7b SHA512 fb3b07174e9081abf8a175f7b83387dd455043ef4f92fa5f7a767c015ec2b2ca8e7bb9d4b0cebfbfaa3d5eaf34b2d28cf196716b5a67d3d517080061d88226fa WHIRLPOOL 1af1d4ba834616457629c591559a98c803af7f7e5be4281e2acdf2f97c5f383ff1ba3dae3a24b7f6d525fb0d0f410c9aee95e468e59c067b1ce36c3cfcfd2bf9
-MISC ChangeLog 83825 SHA256 673cc7929ee2d019b34198accefbc64fc6ec8186ce50d9cd228e5dddfebd0d46 SHA512 2a718ce4bc0c86ef79e6c457ff9d2006553d56bb86d50e8700156233f15484bc1eee97c9264f1650239a1a62cc2967449ee697063cbfa99b68dc9b2d2e70fa03 WHIRLPOOL b233c5516dc6fe9ce5c803f80a0b3fab4524348928d5747e50a14ae8674c8a6a4fb996475b94e4da8616e220054e58fb47dc03afee6f87592e3fc388d7685154
+EBUILD sage-5.4_rc1.ebuild 12377 SHA256 16b78ab2298f23a764b256afeb79d9326f61921c181c49546b87d5f5b95af911 SHA512 7891d47591ebe842f4427ecdea7d2936b1c437fd111881bc5000ad774b52186f0d2fb1348047c537b741d41887f270c72640dac055a5c958260d298f452fd24b WHIRLPOOL 749b0e6261ac7cee6bbfdbf78877c5062ab606436d85ab6c979b819614dd04d6c0f888987259a528e31d88eb615162170d84767501a2aad8c57201af5ed9a0f6
+MISC ChangeLog 84005 SHA256 85ad2e26034ee8f7789bf4137825bbb4e85a62084eff3ff269c29423c6237418 SHA512 2ada014a70add999dbf1f50d6e5514173ef02cdd2fc05ed015e1bdd41d833916a5a0a6915ea965704f6dad4b0ae07b9e64070970bd30fedd9e36579dbb7b3276 WHIRLPOOL ad88936ae28abbc4e52877f8ae032b5170cbea5175b5b9d6f98156c5fe2a3e6e9c6086b3b5b588781ee2f04cb562927076d4a9ecc0faa8a722184dc7383b088a
MISC metadata.xml 362 SHA256 b4274f6588c0ccee0eae8b6ddd0f5972e504f89694dcad64484e8ca0c2b4aac0 SHA512 ba918dfb24664eec38e228dd647823b237529d45eec8b70ebb883961a8153c0dbd3d699635a422c2fd3ec1328201ae940b156c5391ec70da419a56c18af3aa97 WHIRLPOOL 9bce011cff1952632f85f879cd2cc9fa6a575a466795f4ae4c09ae2036a29e91ceb9e8393256b7f933950f59f39fcb3826b0e993fc5ab66cf2097a318db693bb
View
11 sci-mathematics/sage/files/sage-5.4-package.patch
@@ -0,0 +1,11 @@
+--- sage/misc/package.py.orig 2012-10-08 23:40:41.123919676 +1300
++++ sage/misc/package.py 2012-10-08 23:42:59.683070505 +1300
+@@ -185,7 +185,7 @@
+ sage: is_package_installed('sage')
+ True
+ """
+- return any(p.startswith(package) for p in install_package())
++ return False
+
+ def standard_packages():
+ """
View
92 sci-mathematics/sage/files/sage-5.4-singular_extra.patch
@@ -0,0 +1,92 @@
+--- module_list.py.orig 2012-10-08 22:52:08.555265166 +1300
++++ module_list.py 2012-10-08 23:01:59.834936662 +1300
+@@ -677,7 +677,7 @@
+ language="c++",
+ include_dirs = [SAGE_INC + 'singular'],
+ depends = singular_depends,
+- extra_compile_args = givaro_extra_compile_args),
++ extra_compile_args = givaro_extra_compile_args + ['-DNDEBUG']),
+
+ Extension('sage.libs.singular.polynomial',
+ sources = ['sage/libs/singular/polynomial.pyx'],
+@@ -685,7 +685,7 @@
+ language="c++",
+ include_dirs = [SAGE_INC + 'singular'],
+ depends = singular_depends,
+- extra_compile_args = givaro_extra_compile_args),
++ extra_compile_args = givaro_extra_compile_args + ['-DNDEBUG']),
+
+ Extension('sage.libs.singular.ring',
+ sources = ['sage/libs/singular/ring.pyx'],
+@@ -693,7 +693,7 @@
+ language="c++",
+ include_dirs = [SAGE_INC + 'singular'],
+ depends = singular_depends,
+- extra_compile_args = givaro_extra_compile_args),
++ extra_compile_args = givaro_extra_compile_args + ['-DNDEBUG']),
+
+ Extension('sage.libs.singular.groebner_strategy',
+ sources = ['sage/libs/singular/groebner_strategy.pyx'],
+@@ -701,7 +701,7 @@
+ language="c++",
+ include_dirs = [SAGE_INC + 'singular'],
+ depends = singular_depends,
+- extra_compile_args = givaro_extra_compile_args),
++ extra_compile_args = givaro_extra_compile_args + ['-DNDEBUG']),
+
+ Extension('sage.libs.singular.function',
+ sources = ['sage/libs/singular/function.pyx'],
+@@ -709,7 +709,7 @@
+ language="c++",
+ include_dirs = [SAGE_INC +'singular'],
+ depends = singular_depends,
+- extra_compile_args = givaro_extra_compile_args),
++ extra_compile_args = givaro_extra_compile_args + ['-DNDEBUG']),
+
+ Extension('sage.libs.singular.option',
+ sources = ['sage/libs/singular/option.pyx'],
+@@ -717,7 +717,7 @@
+ language="c++",
+ include_dirs = [SAGE_INC + 'singular'],
+ depends = singular_depends,
+- extra_compile_args = givaro_extra_compile_args),
++ extra_compile_args = givaro_extra_compile_args + ['-DNDEBUG']),
+
+ Extension('sage.libs.symmetrica.symmetrica',
+ sources = ["sage/libs/symmetrica/%s"%s for s in ["symmetrica.pyx"]],
+@@ -1009,7 +1009,7 @@
+ language="c++",
+ include_dirs = [SAGE_INC + 'singular'],
+ depends = singular_depends,
+- extra_compile_args = givaro_extra_compile_args),
++ extra_compile_args = givaro_extra_compile_args + ['-DNDEBUG']),
+
+ #Extension('sage.matrix.matrix_pid_dense',
+ # sources = ['sage/matrix/matrix_pid_dense.pyx']),
+@@ -1603,7 +1603,7 @@
+ language="c++",
+ include_dirs = [SAGE_INC + 'singular'],
+ depends = singular_depends,
+- extra_compile_args = givaro_extra_compile_args),
++ extra_compile_args = givaro_extra_compile_args + ['-DNDEBUG']),
+
+ Extension('sage.rings.polynomial.plural',
+ sources = ['sage/rings/polynomial/plural.pyx'],
+@@ -1611,7 +1611,7 @@
+ language="c++",
+ include_dirs = [SAGE_INC +'singular'],
+ depends = [singular_depends],
+- extra_compile_args = givaro_extra_compile_args),
++ extra_compile_args = givaro_extra_compile_args + ['-DNDEBUG']),
+
+ Extension('sage.rings.polynomial.multi_polynomial_libsingular',
+ sources = ['sage/rings/polynomial/multi_polynomial_libsingular.pyx'],
+@@ -1619,7 +1619,7 @@
+ language="c++",
+ include_dirs = [SAGE_INC + 'singular'],
+ depends = singular_depends,
+- extra_compile_args = givaro_extra_compile_args),
++ extra_compile_args = givaro_extra_compile_args + ['-DNDEBUG']),
+
+ Extension('sage.rings.polynomial.multi_polynomial_ring_generic',
+ sources = ['sage/rings/polynomial/multi_polynomial_ring_generic.pyx']),
View
6 sci-mathematics/sage/sage-5.4_rc1.ebuild
@@ -202,8 +202,9 @@ src_prepare() {
module_list.py
# Add -DNDEBUG to objects linking to libsingular and use factory headers from singular.
- sed -i "s:'singular', SAGE_INC + 'factory'\],:'singular'\],extra_compile_args = \['-DNDEBUG'\],:g" \
+ sed -i "s:'singular', SAGE_INC + 'factory'\],:'singular'\],:g" \
module_list.py
+ epatch "${FILESDIR}"/sage-5.4-singular_extra.patch
# TODO: why does Sage fail with linbox commentator ?
@@ -265,6 +266,9 @@ src_prepare() {
sed -i "s:save_session('tmp_f', :save_session(tmp_f, :g" \
sage/misc/session.pyx
+ # make is_installed always return false
+ epatch "${FILESDIR}"/${PN}-5.4-package.patch
+
# patch lie library path
sed -i -e "s:/lib/LiE/:/share/lie/:" \
sage/interfaces/lie.py

1 comment on commit 6344ff7

@kiwifb
Collaborator

For those who have tried or are tempted to try, I never said it installed.... Working on that with the help of Steve.

Please sign in to comment.
Something went wrong with that request. Please try again.