diff options
| author |   Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2009-03-02 19:15:17 +0000 |
|---|---|---|
| committer | Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2009-03-02 19:15:17 +0000 |
| commit | d435ed573e941b46db51574202983718ffdc4363 (patch) | |
| tree | 46743a080aaa6ab3570d5a56b248ffae61285514 /dev-lang | |
| parent | The texinfo fix is in portage now, so no need to keep it in here. (diff) | |
| download | embedded-cross-d435ed573e941b46db51574202983718ffdc4363.tar.gz embedded-cross-d435ed573e941b46db51574202983718ffdc4363.tar.bz2 embedded-cross-d435ed573e941b46db51574202983718ffdc4363.zip | |
Make sure we cope with SYSROOT is empty on cross-compile (even though this should never happen). Fixes ticket #58.
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/python/Manifest | 2 | ||||
| -rw-r--r-- | dev-lang/python/files/python-2.5.2-cross-distutils.patch | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index e9aa8d0..67a8154 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -2,7 +2,7 @@ AUX pydoc.conf 330 RMD160 0cd619ec251597e0fcadc05bfd249915e73baa17 SHA1 a56100d4 AUX pydoc.init 666 RMD160 11caf3a78bce4cdaebacaf21eaf26cc1ce30282e SHA1 88c5cb6d5bf737c74e1be93118cf157630af9ad7 SHA256 0d25c71232b74adb87dc709cc7cd8f8b13c452c0fe82fa33808f907f7a96d628 AUX python-2.4.4-test-cross.patch 977 RMD160 8fdcd45dc202993988f7a1c2b3d918068883b99e SHA1 96f25777150ba05765282a43f08da6b6fab3cb73 SHA256 ff2a131776d560d188ec5069e17fea3eb09c26fdd02124ae5ff34d791c9fd9f6 AUX python-2.5.2-cross-compile.patch 322 RMD160 f392c8087ae168279132a6b6cced3f41a4462b05 SHA1 5b581ecca82f7c204df856ac45940ea495a3ca36 SHA256 4cdf0c771ee858d4e6fb30f33d1d5d989310d9ceacf0cfe955872337527b98d0 -AUX python-2.5.2-cross-distutils.patch 2906 RMD160 88c3fc608f38395cc03f209029c56f715c44b4b3 SHA1 e725180a455ad3a14979d1ab09623e027b44b01b SHA256 9e570ea7050a8ee2ebaa7c8afdb98215ac696fa8d3a04e85b69b10a15b16d7cb +AUX python-2.5.2-cross-distutils.patch 2980 RMD160 2d918f6758a612d6d6464436b30634b269718e1c SHA1 daae51389a7126f00b4a565c4477fafb4670a493 SHA256 8966a5952950e43b82e9e193b5df70a1746ad45c520175fa13734156e84b357f AUX python-2.5.2-cross-enable-ctypes-module.patch 3830 RMD160 52e92eae2ba60d67efb0494f9c4b47544991dcbb SHA1 c77c0c2db298619b2d4f57dc28609d4b1586565b SHA256 028c3ed4bf841fd19641e2c1af0dce68626aeb26168a97acabbba48aa1085cb6 AUX python-2.5.2-cross-sysroot-setup.patch 11300 RMD160 b90c9e4d4b97a85e925131713c8c830ea7827c80 SHA1 75d10dd6d33bb641769fa93e137b126a72ae7d0c SHA256 193a8018a5a2f9a6fe573ddba8893bf03fe831a953fbcb0958fa2b48272ca865 AUX python-2.5.2-test-cross-printf_zd.patch 618 RMD160 5f4d038edc6521e43e872bef42f039d2e91cbe81 SHA1 6a9a761c260d36c0ae4d458978e1ce18d9189ebf SHA256 7b4df16f7044f853819115679c1262b83e54be5141606143879e545d95b136ab diff --git a/dev-lang/python/files/python-2.5.2-cross-distutils.patch b/dev-lang/python/files/python-2.5.2-cross-distutils.patch index f23c226..d75144f 100644 --- a/dev-lang/python/files/python-2.5.2-cross-distutils.patch +++ b/dev-lang/python/files/python-2.5.2-cross-distutils.patch @@ -50,14 +50,17 @@ target system is 32 or 64bit and adapt the libdir accordingly. return libpython else: ---- Lib/distutils/command/build_ext.py 2007-04-24 17:27:25.000000000 +0200 -+++ Lib/distutils/command/build_ext.py.new 2009-02-18 20:32:09.000000000 +0100 -@@ -201,7 +201,8 @@ +--- Lib/distutils/command/build_ext.py 2009-03-02 18:54:19.000000000 +0000 ++++ Lib/distutils/command/build_ext.py.new 2009-03-02 18:53:54.000000000 +0000 +@@ -201,7 +201,11 @@ and sysconfig.get_config_var('Py_ENABLE_SHARED'): if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): # building third party extensions - self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) + sysroot = os.getenv('SYSROOT') ++ if sysroot is NONE: ++ sysroot = '' ++ + self.library_dirs.append(sysroot+sysconfig.get_config_var('LIBDIR')) else: # building python standard extensions |