2013-11-27 12:03:43 +00:00
|
|
|
--- Python-3.4.0b1/Lib/distutils/command/install.py.lib64 2013-11-24 21:36:54.000000000 +0100
|
|
|
|
|
+++ Python-3.4.0b1/Lib/distutils/command/install.py 2013-11-27 11:10:43.821150774 +0100
|
2012-04-12 00:20:08 +00:00
|
|
|
@@ -45,14 +45,14 @@ else:
|
2010-01-13 21:25:18 +00:00
|
|
|
INSTALL_SCHEMES = {
|
|
|
|
|
'unix_prefix': {
|
|
|
|
|
'purelib': '$base/lib/python$py_version_short/site-packages',
|
|
|
|
|
- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
|
|
|
|
|
+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages',
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
|
2010-01-13 21:25:18 +00:00
|
|
|
'scripts': '$base/bin',
|
|
|
|
|
'data' : '$base',
|
|
|
|
|
},
|
|
|
|
|
'unix_home': {
|
|
|
|
|
'purelib': '$base/lib/python',
|
|
|
|
|
- 'platlib': '$base/lib/python',
|
|
|
|
|
+ 'platlib': '$base/lib64/python',
|
|
|
|
|
'headers': '$base/include/python/$dist_name',
|
|
|
|
|
'scripts': '$base/bin',
|
|
|
|
|
'data' : '$base',
|
2013-11-27 12:03:43 +00:00
|
|
|
--- Python-3.4.0b1/Lib/distutils/sysconfig.py.lib64 2013-11-24 21:36:54.000000000 +0100
|
|
|
|
|
+++ Python-3.4.0b1/Lib/distutils/sysconfig.py 2013-11-27 11:10:43.821150774 +0100
|
|
|
|
|
@@ -141,8 +141,12 @@
|
2012-07-20 20:34:09 +00:00
|
|
|
prefix = plat_specific and EXEC_PREFIX or PREFIX
|
2010-01-13 21:25:18 +00:00
|
|
|
|
|
|
|
|
if os.name == "posix":
|
|
|
|
|
+ if plat_specific or standard_lib:
|
|
|
|
|
+ lib = "lib64"
|
|
|
|
|
+ else:
|
|
|
|
|
+ lib = "lib"
|
|
|
|
|
libpython = os.path.join(prefix,
|
|
|
|
|
- "lib", "python" + get_python_version())
|
|
|
|
|
+ lib, "python" + get_python_version())
|
|
|
|
|
if standard_lib:
|
|
|
|
|
return libpython
|
|
|
|
|
else:
|
2013-11-27 12:03:43 +00:00
|
|
|
--- Python-3.4.0b1/Lib/site.py.lib64 2013-11-24 21:36:54.000000000 +0100
|
|
|
|
|
+++ Python-3.4.0b1/Lib/site.py 2013-11-27 11:10:43.822150773 +0100
|
|
|
|
|
@@ -304,12 +304,16 @@
|
Update to Python 3.4 alpha 4.
- Refreshed patches: 55 (systemtap), 102 (lib64), 111 (no static lib),
114 (statvfs flags), 132 (unittest rpmbuild hooks), 134 (fix COUNT_ALLOCS in
test_sys), 143 (tsc on ppc64), 146 (hashlib fips), 153 (test gdb noise),
157 (UID+GID overflows), 173 (ENOPROTOOPT in bind_port), 186 (dont raise
from py_compile)
- Removed patches: 129 (test_subprocess nonreadable dir - no longer fails in
Koji), 142 (the mock issue that caused this is fixed)
- Added patch 187 (remove thread atfork) - will be in next version
- Refreshed script for checking pyc and pyo timestamps with new ignored files.
- The fips patch is disabled for now until upstream makes a final decision
what to do with sha3 implementation for 3.4.0.
2013-11-05 11:39:14 +00:00
|
|
|
seen.add(prefix)
|
2013-11-27 12:03:43 +00:00
|
|
|
|
Update to Python 3.4 alpha 4.
- Refreshed patches: 55 (systemtap), 102 (lib64), 111 (no static lib),
114 (statvfs flags), 132 (unittest rpmbuild hooks), 134 (fix COUNT_ALLOCS in
test_sys), 143 (tsc on ppc64), 146 (hashlib fips), 153 (test gdb noise),
157 (UID+GID overflows), 173 (ENOPROTOOPT in bind_port), 186 (dont raise
from py_compile)
- Removed patches: 129 (test_subprocess nonreadable dir - no longer fails in
Koji), 142 (the mock issue that caused this is fixed)
- Added patch 187 (remove thread atfork) - will be in next version
- Refreshed script for checking pyc and pyo timestamps with new ignored files.
- The fips patch is disabled for now until upstream makes a final decision
what to do with sha3 implementation for 3.4.0.
2013-11-05 11:39:14 +00:00
|
|
|
if os.sep == '/':
|
3.2a1
* Sat Aug 21 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.0.a1
- 3.2a1; add alphatag
- rework %%files in the light of PEP 3147 (__pycache__)
- drop our configuration patch to Setup.dist (patch 0): setup.py should do a
better job of things, and the %%files explicitly lists our modules (r82746
appears to break the old way of doing things). This leads to various modules
changing from "foomodule.so" to "foo.so". It also leads to the optimized build
dropping the _sha1, _sha256 and _sha512 modules, but these are provided by
_hashlib; _weakref becomes a builtin module; xxsubtype goes away (it's only for
testing/devel purposes)
- fixup patches 3, 4, 6, 8, 102, 103, 105, 111 for the rebase
- remove upstream patches: 7 (system expat), 106, 107, 108 (audioop reformat
plus CVE-2010-1634 and CVE-2010-2089), 109 (CVE-2008-5983)
- add machinery for rebuilding "configure" and friends, using the correct
version of autoconf (patch 300)
- patch the debug build's usage of COUNT_ALLOCS to be less verbose (patch 125)
- "modulator" was removed upstream
- drop "-b" from patch applications affecting .py files to avoid littering the
installation tree
2010-08-21 22:08:26 +00:00
|
|
|
+ sitepackages.append(os.path.join(prefix, "lib64",
|
2010-01-13 21:25:18 +00:00
|
|
|
+ "python" + sys.version[:3],
|
|
|
|
|
+ "site-packages"))
|
3.2a1
* Sat Aug 21 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.0.a1
- 3.2a1; add alphatag
- rework %%files in the light of PEP 3147 (__pycache__)
- drop our configuration patch to Setup.dist (patch 0): setup.py should do a
better job of things, and the %%files explicitly lists our modules (r82746
appears to break the old way of doing things). This leads to various modules
changing from "foomodule.so" to "foo.so". It also leads to the optimized build
dropping the _sha1, _sha256 and _sha512 modules, but these are provided by
_hashlib; _weakref becomes a builtin module; xxsubtype goes away (it's only for
testing/devel purposes)
- fixup patches 3, 4, 6, 8, 102, 103, 105, 111 for the rebase
- remove upstream patches: 7 (system expat), 106, 107, 108 (audioop reformat
plus CVE-2010-1634 and CVE-2010-2089), 109 (CVE-2008-5983)
- add machinery for rebuilding "configure" and friends, using the correct
version of autoconf (patch 300)
- patch the debug build's usage of COUNT_ALLOCS to be less verbose (patch 125)
- "modulator" was removed upstream
- drop "-b" from patch applications affecting .py files to avoid littering the
installation tree
2010-08-21 22:08:26 +00:00
|
|
|
sitepackages.append(os.path.join(prefix, "lib",
|
2010-01-13 21:25:18 +00:00
|
|
|
"python" + sys.version[:3],
|
|
|
|
|
"site-packages"))
|
3.2a1
* Sat Aug 21 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.0.a1
- 3.2a1; add alphatag
- rework %%files in the light of PEP 3147 (__pycache__)
- drop our configuration patch to Setup.dist (patch 0): setup.py should do a
better job of things, and the %%files explicitly lists our modules (r82746
appears to break the old way of doing things). This leads to various modules
changing from "foomodule.so" to "foo.so". It also leads to the optimized build
dropping the _sha1, _sha256 and _sha512 modules, but these are provided by
_hashlib; _weakref becomes a builtin module; xxsubtype goes away (it's only for
testing/devel purposes)
- fixup patches 3, 4, 6, 8, 102, 103, 105, 111 for the rebase
- remove upstream patches: 7 (system expat), 106, 107, 108 (audioop reformat
plus CVE-2010-1634 and CVE-2010-2089), 109 (CVE-2008-5983)
- add machinery for rebuilding "configure" and friends, using the correct
version of autoconf (patch 300)
- patch the debug build's usage of COUNT_ALLOCS to be less verbose (patch 125)
- "modulator" was removed upstream
- drop "-b" from patch applications affecting .py files to avoid littering the
installation tree
2010-08-21 22:08:26 +00:00
|
|
|
sitepackages.append(os.path.join(prefix, "lib", "site-python"))
|
2010-01-13 21:25:18 +00:00
|
|
|
else:
|
3.2a1
* Sat Aug 21 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.0.a1
- 3.2a1; add alphatag
- rework %%files in the light of PEP 3147 (__pycache__)
- drop our configuration patch to Setup.dist (patch 0): setup.py should do a
better job of things, and the %%files explicitly lists our modules (r82746
appears to break the old way of doing things). This leads to various modules
changing from "foomodule.so" to "foo.so". It also leads to the optimized build
dropping the _sha1, _sha256 and _sha512 modules, but these are provided by
_hashlib; _weakref becomes a builtin module; xxsubtype goes away (it's only for
testing/devel purposes)
- fixup patches 3, 4, 6, 8, 102, 103, 105, 111 for the rebase
- remove upstream patches: 7 (system expat), 106, 107, 108 (audioop reformat
plus CVE-2010-1634 and CVE-2010-2089), 109 (CVE-2008-5983)
- add machinery for rebuilding "configure" and friends, using the correct
version of autoconf (patch 300)
- patch the debug build's usage of COUNT_ALLOCS to be less verbose (patch 125)
- "modulator" was removed upstream
- drop "-b" from patch applications affecting .py files to avoid littering the
installation tree
2010-08-21 22:08:26 +00:00
|
|
|
sitepackages.append(prefix)
|
|
|
|
|
+ sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
|
|
|
|
|
sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
|
2010-01-13 21:25:18 +00:00
|
|
|
if sys.platform == "darwin":
|
3.2a1
* Sat Aug 21 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.0.a1
- 3.2a1; add alphatag
- rework %%files in the light of PEP 3147 (__pycache__)
- drop our configuration patch to Setup.dist (patch 0): setup.py should do a
better job of things, and the %%files explicitly lists our modules (r82746
appears to break the old way of doing things). This leads to various modules
changing from "foomodule.so" to "foo.so". It also leads to the optimized build
dropping the _sha1, _sha256 and _sha512 modules, but these are provided by
_hashlib; _weakref becomes a builtin module; xxsubtype goes away (it's only for
testing/devel purposes)
- fixup patches 3, 4, 6, 8, 102, 103, 105, 111 for the rebase
- remove upstream patches: 7 (system expat), 106, 107, 108 (audioop reformat
plus CVE-2010-1634 and CVE-2010-2089), 109 (CVE-2008-5983)
- add machinery for rebuilding "configure" and friends, using the correct
version of autoconf (patch 300)
- patch the debug build's usage of COUNT_ALLOCS to be less verbose (patch 125)
- "modulator" was removed upstream
- drop "-b" from patch applications affecting .py files to avoid littering the
installation tree
2010-08-21 22:08:26 +00:00
|
|
|
# for framework builds *only* we add the standard Apple
|
2013-11-27 12:03:43 +00:00
|
|
|
--- Python-3.4.0b1/Lib/sysconfig.py.lib64 2013-11-24 21:36:54.000000000 +0100
|
|
|
|
|
+++ Python-3.4.0b1/Lib/sysconfig.py 2013-11-27 11:10:43.822150773 +0100
|
|
|
|
|
@@ -20,10 +20,10 @@
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
|
|
|
|
|
_INSTALL_SCHEMES = {
|
|
|
|
|
'posix_prefix': {
|
2012-07-20 20:34:09 +00:00
|
|
|
- 'stdlib': '{installed_base}/lib/python{py_version_short}',
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
- 'platstdlib': '{platbase}/lib/python{py_version_short}',
|
2012-07-20 20:34:09 +00:00
|
|
|
+ 'stdlib': '{installed_base}/lib64/python{py_version_short}',
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
+ 'platstdlib': '{platbase}/lib64/python{py_version_short}',
|
|
|
|
|
'purelib': '{base}/lib/python{py_version_short}/site-packages',
|
|
|
|
|
- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
|
|
|
|
|
+ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
|
|
|
|
|
'include':
|
2012-07-20 20:34:09 +00:00
|
|
|
'{installed_base}/include/python{py_version_short}{abiflags}',
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
'platinclude':
|
2013-11-27 12:03:43 +00:00
|
|
|
@@ -61,10 +61,10 @@
|
2012-07-20 20:34:09 +00:00
|
|
|
'data': '{userbase}',
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
},
|
|
|
|
|
'posix_user': {
|
|
|
|
|
- 'stdlib': '{userbase}/lib/python{py_version_short}',
|
|
|
|
|
- 'platstdlib': '{userbase}/lib/python{py_version_short}',
|
|
|
|
|
+ 'stdlib': '{userbase}/lib64/python{py_version_short}',
|
|
|
|
|
+ 'platstdlib': '{userbase}/lib64/python{py_version_short}',
|
|
|
|
|
'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
|
|
|
|
|
- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
|
|
|
|
|
+ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
|
|
|
|
|
'include': '{userbase}/include/python{py_version_short}',
|
|
|
|
|
'scripts': '{userbase}/bin',
|
2012-07-20 20:34:09 +00:00
|
|
|
'data': '{userbase}',
|
2013-11-27 12:03:43 +00:00
|
|
|
--- Python-3.4.0b1/Lib/test/test_site.py.lib64 2013-11-24 21:36:55.000000000 +0100
|
|
|
|
|
+++ Python-3.4.0b1/Lib/test/test_site.py 2013-11-27 11:10:43.822150773 +0100
|
|
|
|
|
@@ -244,12 +244,15 @@
|
2012-04-12 00:20:08 +00:00
|
|
|
self.assertEqual(dirs[2], wanted)
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
elif os.sep == '/':
|
2012-04-12 00:20:08 +00:00
|
|
|
# OS X non-framwework builds, Linux, FreeBSD, etc
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
- self.assertEqual(len(dirs), 2)
|
|
|
|
|
- wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
|
|
|
|
|
+ self.assertEqual(len(dirs), 3)
|
|
|
|
|
+ wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3],
|
|
|
|
|
'site-packages')
|
|
|
|
|
self.assertEqual(dirs[0], wanted)
|
|
|
|
|
- wanted = os.path.join('xoxo', 'lib', 'site-python')
|
|
|
|
|
+ wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
|
|
|
|
|
+ 'site-packages')
|
|
|
|
|
self.assertEqual(dirs[1], wanted)
|
|
|
|
|
+ wanted = os.path.join('xoxo', 'lib', 'site-python')
|
|
|
|
|
+ self.assertEqual(dirs[2], wanted)
|
|
|
|
|
else:
|
2012-04-12 00:20:08 +00:00
|
|
|
# other platforms
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
self.assertEqual(len(dirs), 2)
|
2013-11-27 12:03:43 +00:00
|
|
|
--- Python-3.4.0b1/Makefile.pre.in.lib64 2013-11-27 11:10:43.814150786 +0100
|
|
|
|
|
+++ Python-3.4.0b1/Makefile.pre.in 2013-11-27 11:10:43.823150771 +0100
|
|
|
|
|
@@ -115,7 +115,7 @@
|
2010-01-13 21:25:18 +00:00
|
|
|
MANDIR= @mandir@
|
|
|
|
|
INCLUDEDIR= @includedir@
|
|
|
|
|
CONFINCLUDEDIR= $(exec_prefix)/include
|
|
|
|
|
-SCRIPTDIR= $(prefix)/lib
|
|
|
|
|
+SCRIPTDIR= $(prefix)/lib64
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
ABIFLAGS= @ABIFLAGS@
|
2010-01-13 21:25:18 +00:00
|
|
|
|
|
|
|
|
# Detailed destination directories
|
2013-11-27 12:03:43 +00:00
|
|
|
--- Python-3.4.0b1/Modules/getpath.c.lib64 2013-11-24 21:36:56.000000000 +0100
|
|
|
|
|
+++ Python-3.4.0b1/Modules/getpath.c 2013-11-27 11:17:33.619449704 +0100
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
@@ -122,8 +122,8 @@
|
2010-01-13 21:25:18 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifndef PYTHONPATH
|
|
|
|
|
-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
|
|
|
|
|
- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
|
|
|
|
|
+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
|
|
|
|
|
+ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifndef LANDMARK
|
2013-11-27 12:03:43 +00:00
|
|
|
@@ -498,7 +498,7 @@
|
|
|
|
|
_pythonpath = _Py_char2wchar(PYTHONPATH, NULL);
|
|
|
|
|
_prefix = _Py_char2wchar(PREFIX, NULL);
|
|
|
|
|
_exec_prefix = _Py_char2wchar(EXEC_PREFIX, NULL);
|
|
|
|
|
- lib_python = _Py_char2wchar("lib/python" VERSION, NULL);
|
2013-11-27 12:33:51 +00:00
|
|
|
+ lib_python = _Py_char2wchar("lib64/python" VERSION, NULL);
|
2010-01-13 21:25:18 +00:00
|
|
|
|
2013-11-27 12:03:43 +00:00
|
|
|
if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
|
|
|
|
|
Py_FatalError(
|
|
|
|
|
@@ -687,7 +687,7 @@
|
2010-01-13 21:25:18 +00:00
|
|
|
}
|
|
|
|
|
else
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
wcsncpy(zip_path, _prefix, MAXPATHLEN);
|
2010-01-13 21:25:18 +00:00
|
|
|
- joinpath(zip_path, L"lib/python00.zip");
|
|
|
|
|
+ joinpath(zip_path, L"lib64/python00.zip");
|
3.2a1
* Sat Aug 21 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.0.a1
- 3.2a1; add alphatag
- rework %%files in the light of PEP 3147 (__pycache__)
- drop our configuration patch to Setup.dist (patch 0): setup.py should do a
better job of things, and the %%files explicitly lists our modules (r82746
appears to break the old way of doing things). This leads to various modules
changing from "foomodule.so" to "foo.so". It also leads to the optimized build
dropping the _sha1, _sha256 and _sha512 modules, but these are provided by
_hashlib; _weakref becomes a builtin module; xxsubtype goes away (it's only for
testing/devel purposes)
- fixup patches 3, 4, 6, 8, 102, 103, 105, 111 for the rebase
- remove upstream patches: 7 (system expat), 106, 107, 108 (audioop reformat
plus CVE-2010-1634 and CVE-2010-2089), 109 (CVE-2008-5983)
- add machinery for rebuilding "configure" and friends, using the correct
version of autoconf (patch 300)
- patch the debug build's usage of COUNT_ALLOCS to be less verbose (patch 125)
- "modulator" was removed upstream
- drop "-b" from patch applications affecting .py files to avoid littering the
installation tree
2010-08-21 22:08:26 +00:00
|
|
|
bufsz = wcslen(zip_path); /* Replace "00" with version */
|
2010-01-13 21:25:18 +00:00
|
|
|
zip_path[bufsz - 6] = VERSION[0];
|
|
|
|
|
zip_path[bufsz - 5] = VERSION[2];
|
2013-11-27 12:03:43 +00:00
|
|
|
@@ -699,7 +699,7 @@
|
2010-01-13 21:25:18 +00:00
|
|
|
fprintf(stderr,
|
|
|
|
|
"Could not find platform dependent libraries <exec_prefix>\n");
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
|
2010-01-13 21:25:18 +00:00
|
|
|
- joinpath(exec_prefix, L"lib/lib-dynload");
|
|
|
|
|
+ joinpath(exec_prefix, L"lib64/lib-dynload");
|
|
|
|
|
}
|
|
|
|
|
/* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
|
|
|
|
|
|
2013-11-27 12:03:43 +00:00
|
|
|
--- Python-3.4.0b1/setup.py.lib64 2013-11-24 21:36:56.000000000 +0100
|
|
|
|
|
+++ Python-3.4.0b1/setup.py 2013-11-27 11:10:43.824150769 +0100
|
|
|
|
|
@@ -441,7 +441,7 @@
|
* Tue Dec 28 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.5.b2
- 3.2b2
- rework patch 3 (removal of mimeaudio tests), patch 6 (no static libs),
patch 8 (systemtap), patch 102 (lib64)
- remove patch 4 (rendered redundant by upstream r85537), patch 103 (PEP 3149),
patch 110 (upstreamed expat fix), patch 111 (parallel build fix for grammar
fixed upstream)
- regenerate patch 300 (autotool intermediates)
- workaround COUNT_ALLOCS weakref issues in test suite (patch 126, patch 127,
patch 128)
- stop using runtest.sh in %%check (dropped by upstream), replacing with
regrtest; fixup list of failing tests
- introduce "pyshortver", "SOABI_optimized" and "SOABI_debug" macros
- rework manifests of shared libraries to use "SOABI_" macros, reflecting
PEP 3149
- drop itertools, operator and _collections modules from the manifests as py3k
commit r84058 moved these inside libpython; json/tests moved to test/json_tests
- move turtle code into the tkinter subpackage
2010-12-29 18:26:29 +00:00
|
|
|
# directories (i.e. '.' and 'Include') must be first. See issue
|
|
|
|
|
# 10520.
|
2012-08-14 01:11:12 +00:00
|
|
|
if not cross_compiling:
|
|
|
|
|
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
|
|
|
|
+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
|
|
|
|
|
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
|
|
|
|
# only change this for cross builds for 3.3, issues on Mageia
|
|
|
|
|
if cross_compiling:
|
2013-11-27 12:03:43 +00:00
|
|
|
@@ -718,11 +718,11 @@
|
3.2a1
* Sat Aug 21 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.0.a1
- 3.2a1; add alphatag
- rework %%files in the light of PEP 3147 (__pycache__)
- drop our configuration patch to Setup.dist (patch 0): setup.py should do a
better job of things, and the %%files explicitly lists our modules (r82746
appears to break the old way of doing things). This leads to various modules
changing from "foomodule.so" to "foo.so". It also leads to the optimized build
dropping the _sha1, _sha256 and _sha512 modules, but these are provided by
_hashlib; _weakref becomes a builtin module; xxsubtype goes away (it's only for
testing/devel purposes)
- fixup patches 3, 4, 6, 8, 102, 103, 105, 111 for the rebase
- remove upstream patches: 7 (system expat), 106, 107, 108 (audioop reformat
plus CVE-2010-1634 and CVE-2010-2089), 109 (CVE-2008-5983)
- add machinery for rebuilding "configure" and friends, using the correct
version of autoconf (patch 300)
- patch the debug build's usage of COUNT_ALLOCS to be less verbose (patch 125)
- "modulator" was removed upstream
- drop "-b" from patch applications affecting .py files to avoid littering the
installation tree
2010-08-21 22:08:26 +00:00
|
|
|
elif curses_library:
|
|
|
|
|
readline_libs.append(curses_library)
|
2010-01-13 21:25:18 +00:00
|
|
|
elif self.compiler.find_library_file(lib_dirs +
|
3.2a1
* Sat Aug 21 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-0.0.a1
- 3.2a1; add alphatag
- rework %%files in the light of PEP 3147 (__pycache__)
- drop our configuration patch to Setup.dist (patch 0): setup.py should do a
better job of things, and the %%files explicitly lists our modules (r82746
appears to break the old way of doing things). This leads to various modules
changing from "foomodule.so" to "foo.so". It also leads to the optimized build
dropping the _sha1, _sha256 and _sha512 modules, but these are provided by
_hashlib; _weakref becomes a builtin module; xxsubtype goes away (it's only for
testing/devel purposes)
- fixup patches 3, 4, 6, 8, 102, 103, 105, 111 for the rebase
- remove upstream patches: 7 (system expat), 106, 107, 108 (audioop reformat
plus CVE-2010-1634 and CVE-2010-2089), 109 (CVE-2008-5983)
- add machinery for rebuilding "configure" and friends, using the correct
version of autoconf (patch 300)
- patch the debug build's usage of COUNT_ALLOCS to be less verbose (patch 125)
- "modulator" was removed upstream
- drop "-b" from patch applications affecting .py files to avoid littering the
installation tree
2010-08-21 22:08:26 +00:00
|
|
|
- ['/usr/lib/termcap'],
|
|
|
|
|
+ ['/usr/lib64/termcap'],
|
|
|
|
|
'termcap'):
|
2010-01-13 21:25:18 +00:00
|
|
|
readline_libs.append('termcap')
|
|
|
|
|
exts.append( Extension('readline', ['readline.c'],
|
|
|
|
|
- library_dirs=['/usr/lib/termcap'],
|
|
|
|
|
+ library_dirs=['/usr/lib64/termcap'],
|
|
|
|
|
extra_link_args=readline_extra_link_args,
|
|
|
|
|
libraries=readline_libs) )
|
|
|
|
|
else:
|
2013-11-27 12:03:43 +00:00
|
|
|
@@ -759,8 +759,8 @@
|
2010-01-13 21:25:18 +00:00
|
|
|
if krb5_h:
|
|
|
|
|
ssl_incs += krb5_h
|
|
|
|
|
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
|
|
|
|
|
- ['/usr/local/ssl/lib',
|
|
|
|
|
- '/usr/contrib/ssl/lib/'
|
|
|
|
|
+ ['/usr/local/ssl/lib64',
|
|
|
|
|
+ '/usr/contrib/ssl/lib64/'
|
|
|
|
|
] )
|
|
|
|
|
|
|
|
|
|
if (ssl_incs is not None and
|
