diff options
| author |   Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2010-01-24 17:54:05 +0000 |
|---|---|---|
| committer | Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2010-01-24 17:54:05 +0000 |
| commit | 91ab2fc5f68455a04d2bb2331b44e29f54bcc351 (patch) | |
| tree | 015e47ffe5cab869e69f5c773d832eb0b862c82f | |
| parent | Add this little tool that eases the transistion between crossdev-wrappers and... (diff) | |
| download | embedded-cross-91ab2fc5f68455a04d2bb2331b44e29f54bcc351.tar.gz embedded-cross-91ab2fc5f68455a04d2bb2331b44e29f54bcc351.tar.bz2 embedded-cross-91ab2fc5f68455a04d2bb2331b44e29f54bcc351.zip | |
Fixes ticket #292.
| -rw-r--r-- | dev-lang/python/Manifest | 3 | ||||
| -rw-r--r-- | dev-lang/python/files/python-2.6.4-cross-libffi-pkg-config.patch | 12 | ||||
| -rw-r--r-- | dev-lang/python/python-2.6.4.ebuild | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 9fb0988..770afc7 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -15,6 +15,7 @@ AUX python-2.6-cross-distutils-sysconfig.patch 1802 RMD160 346449ad5f2f77411dd59 AUX python-2.6-cross-setup-sysroot.patch 10406 RMD160 30d715895f1d48d2acb039549ca58a03f1b06ee0 SHA1 28b01657df80581d9eb82058e12bc93d67657cf6 SHA256 0867495ee0204167ff2cc5af9998e30281829b4cc1d0d340b61dd7da35950065 AUX python-2.6-enable-ctypes-cross-build.patch 1439 RMD160 ce61a6b7bd16fb812ea6cc8821d73b53b597e0be SHA1 410b1b3e4b108dbf814bacbc8b7eacba8f52a61b SHA256 bb57add95e66690d1b0ddc717d5f0e9bd9e6bdc2ceba7a293ad183be6f87cd7c AUX python-2.6-test-cross.patch 914 RMD160 1f421b5565d39a24b887e85cbecaf3857741f756 SHA1 9c05fbe28aac6373f24317db5c277bc4549dde0c SHA256 8264f6ffe5aedcce67bea00b0346e5416a5486da2229bf82fe748d87ec65c4de +AUX python-2.6.4-cross-libffi-pkg-config.patch 534 RMD160 923b49a6d89954de4da90de27faa7d076875d898 SHA1 63224b0d35516d90346ace527815532762e43414 SHA256 e7f9309c2dd651a74df32412172ec29ca5797e05ebf8883c2cf52f14b15880d0 AUX python-2.6.4-cross-setup-sysroot.patch 11648 RMD160 90d58d00d2c6e27104a83281e9db4ddf56dacae4 SHA1 fb599e6d69c95710f59d6799c01a50eee1d74349 SHA256 17bcc15eac99fb055761ac359612ad6b32e796d36e5474a044d2bba8a4294f1f AUX python-2.6_turkish.patch 4606 RMD160 e8a12a537fd81e8a4de0f29ce57ebf48cf786e69 SHA1 9ae0d969f34513da90b87bed966d48ea91b46bf2 SHA256 1f90030a415a5395b14677dce1bd07fbaa56d235aecd4fdfae086d09f756c138 DIST Python-2.5.4.tar.bz2 9821313 RMD160 3a76c83464c3b1c38a60351ab054e33ac7195663 SHA1 0f2e819d6381f72f26c734e00a6780b3933ea404 SHA256 bc8d896a2bfe5523ba93b8d89b71017b74e8e6cb21dc676a0ccff668c8780110 @@ -27,4 +28,4 @@ DIST python-gentoo-patches-2.6.4.tar.bz2 11032 RMD160 83903892ef18880f876e7a140c EBUILD python-2.5.4-r3.ebuild 9962 RMD160 b9c89cb2974b233ee43ac12971deaa2e3c2549c3 SHA1 b477647a53d9b958146868dabb4e451161e3d91b SHA256 8ad3de1c73110d0fa1233539d58d75e74dd411e8c955bbbd0b5d967f2e49a5a6 EBUILD python-2.6.2-r1.ebuild 9374 RMD160 e2b6b466ff8cfa363d5af68aadd9189daa9bdbfd SHA1 3d207025be7d8ad30f548a351a695dbec641b227 SHA256 cce9f301cae10a0c8e6ce29a9161f3c72b0cf91d372dfbb18006d28ccbde9b8f EBUILD python-2.6.2-r2.ebuild 11162 RMD160 9f3215c3353f41a7427334b22d1dd00c54e852eb SHA1 7c8b87d5abcb511bb0e6c85871e0c4098d0be41c SHA256 2e431e703e3b255f619e45295c529a7abb13898014330d6d2aeea474da36a424 -EBUILD python-2.6.4.ebuild 10766 RMD160 117db0eb7204e389dc66bdda46c62d2f28cc070e SHA1 78fd91c8b9f2f305f417a16c1dbc2daeec1f4d44 SHA256 56c5ee943ba15da505d8b96d823b26699d635300677e204bc80b2ac134c677fd +EBUILD python-2.6.4.ebuild 10901 RMD160 b93e3e3c93b83778014b007476f12c2a8014e354 SHA1 4c95cc7084aeab1a576e64f8b682335c7ed0911a SHA256 fc21b47629be944003757b39ad4c846b567708f96a718dc8228d08624a7925ef diff --git a/dev-lang/python/files/python-2.6.4-cross-libffi-pkg-config.patch b/dev-lang/python/files/python-2.6.4-cross-libffi-pkg-config.patch new file mode 100644 index 0000000..2fe6fcd --- /dev/null +++ b/dev-lang/python/files/python-2.6.4-cross-libffi-pkg-config.patch @@ -0,0 +1,12 @@ +--- configure.in.orig 2010-01-20 23:40:07.000000000 +0800 ++++ configure.in 2010-01-20 23:40:32.000000000 +0800 +@@ -1989,7 +1989,8 @@ + AC_HELP_STRING(--with-system-ffi, build _ctypes module using an installed ffi library)) + + if test "$with_system_ffi" = "yes"; then +- LIBFFI_INCLUDEDIR="`pkg-config libffi --cflags-only-I 2>/dev/null | sed -e 's/^-I//'`" ++ PKG_PROG_PKG_CONFIG([0.20]) ++ LIBFFI_INCLUDEDIR="`${PKG_CONFIG} libffi --cflags-only-I 2>/dev/null | sed -e 's/^-I//'`" + else + LIBFFI_INCLUDEDIR="" + fi diff --git a/dev-lang/python/python-2.6.4.ebuild b/dev-lang/python/python-2.6.4.ebuild index 64ab9ec..32d9ffa 100644 --- a/dev-lang/python/python-2.6.4.ebuild +++ b/dev-lang/python/python-2.6.4.ebuild @@ -99,6 +99,8 @@ src_prepare() { epatch "${FILESDIR}"/python-2.5.2-cross-distutils-build_ext.patch epatch "${FILESDIR}"/python-2.6-cross-distutils-sysconfig.patch epatch "${FILESDIR}"/python-2.5.2-cross-distutils-install.patch + # Use a cross-compile aware pkg-config command to setup libffi usage + epatch "${FILESDIR}"/python-2.6.4-cross-libffi-pkg-config.patch sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ Lib/distutils/command/install.py \ |