diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-11-08 10:34:46 -0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2010-11-14 21:08:26 -0800 |
| commit | 793bb465b3a6b0c883340621575b9944d7ccaf5a (patch) | |
| tree | b668cfadf3836b3d018dd76005f3bb65b4f8dd03 /meta/recipes-devtools/python/python_2.6.5.bb | |
| parent | a7af5c516e547e669d92569dba21a9c1c790cf7f (diff) | |
| download | poky-793bb465b3a6b0c883340621575b9944d7ccaf5a.tar.gz | |
python, python-native upgrade from 2.6.5 to 2.6.6
Removed these patch:
python-native-2.6.5/00-fix-bindir-libdir-for-cross.patch
python/00-fix-bindir-libdir-for-cross.patch
The upstream code has changed, and it does not need the above 2 patches
(fixes) anymore.
Patches rebased to the newer code:
python/01-use-proper-tools-for-cross-build.patch
python/04-default-is-optimized.patch
python/06-avoid_usr_lib_termcap_path_in_linking.patch
python/99-ignore-optimization-flag.patch
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-devtools/python/python_2.6.5.bb')
| -rw-r--r-- | meta/recipes-devtools/python/python_2.6.5.bb | 124 |
1 files changed, 0 insertions, 124 deletions
diff --git a/meta/recipes-devtools/python/python_2.6.5.bb b/meta/recipes-devtools/python/python_2.6.5.bb deleted file mode 100644 index ec5442dc7c..0000000000 --- a/meta/recipes-devtools/python/python_2.6.5.bb +++ /dev/null | |||
| @@ -1,124 +0,0 @@ | |||
| 1 | require python.inc | ||
| 2 | DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" | ||
| 3 | DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" | ||
| 4 | # set to .0 on every increase of INC_PR | ||
| 5 | PR = "${INC_PR}.3" | ||
| 6 | |||
| 7 | SRC_URI = "\ | ||
| 8 | http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ | ||
| 9 | file://00-fix-bindir-libdir-for-cross.patch \ | ||
| 10 | file://01-use-proper-tools-for-cross-build.patch \ | ||
| 11 | file://02-remove-test-for-cross.patch \ | ||
| 12 | file://03-fix-tkinter-detection.patch \ | ||
| 13 | file://04-default-is-optimized.patch \ | ||
| 14 | file://05-enable-ctypes-cross-build.patch \ | ||
| 15 | file://06-avoid_usr_lib_termcap_path_in_linking.patch \ | ||
| 16 | file://99-ignore-optimization-flag.patch \ | ||
| 17 | file://sitecustomize.py \ | ||
| 18 | " | ||
| 19 | S = "${WORKDIR}/Python-${PV}" | ||
| 20 | |||
| 21 | inherit autotools | ||
| 22 | |||
| 23 | # The 3 lines below are copied from the libffi recipe, ctypes ships its own copy of the libffi sources | ||
| 24 | #Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :( | ||
| 25 | TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__" | ||
| 26 | TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__" | ||
| 27 | |||
| 28 | do_configure_prepend() { | ||
| 29 | autoreconf -Wcross --verbose --install --force --exclude=autopoint Modules/_ctypes/libffi || oenote "_ctypes failed to autoreconf" | ||
| 30 | } | ||
| 31 | |||
| 32 | # | ||
| 33 | # Copy config.h and an appropriate Makefile for distutils.sysconfig, | ||
| 34 | # which laters uses the information out of these to compile extensions | ||
| 35 | # | ||
| 36 | do_compile_prepend() { | ||
| 37 | install -d ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ | ||
| 38 | install -d ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ | ||
| 39 | install -m 0644 pyconfig.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ | ||
| 40 | install -m 0644 Makefile Makefile.orig | ||
| 41 | install -m 0644 Makefile Makefile.backup | ||
| 42 | sed -e 's,${includedir},${STAGING_INCDIR},' < Makefile.backup > Makefile | ||
| 43 | install -m 0644 Makefile Makefile.backup | ||
| 44 | sed -e 's,${libdir},${STAGING_LIBDIR},' < Makefile.backup > Makefile | ||
| 45 | install -m 0644 Makefile ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ | ||
| 46 | } | ||
| 47 | |||
| 48 | do_compile() { | ||
| 49 | oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ | ||
| 50 | HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ | ||
| 51 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | ||
| 52 | STAGING_INCDIR=${STAGING_INCDIR} \ | ||
| 53 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ | ||
| 54 | OPT="${CFLAGS}" libpython${PYTHON_MAJMIN}.so | ||
| 55 | |||
| 56 | oe_libinstall -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR} | ||
| 57 | |||
| 58 | oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ | ||
| 59 | HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ | ||
| 60 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | ||
| 61 | STAGING_INCDIR=${STAGING_INCDIR} \ | ||
| 62 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ | ||
| 63 | OPT="${CFLAGS}" | ||
| 64 | } | ||
| 65 | |||
| 66 | do_install() { | ||
| 67 | install -m 0644 Makefile.orig Makefile | ||
| 68 | |||
| 69 | oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ | ||
| 70 | HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ | ||
| 71 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | ||
| 72 | STAGING_INCDIR=${STAGING_INCDIR} \ | ||
| 73 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ | ||
| 74 | DESTDIR=${D} LIBDIR=${libdir} install | ||
| 75 | |||
| 76 | install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} | ||
| 77 | |||
| 78 | # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144 | ||
| 79 | sed -i -e s,ccache,'$(CCACHE)', ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile | ||
| 80 | } | ||
| 81 | |||
| 82 | require python-${PYTHON_MAJMIN}-manifest.inc | ||
| 83 | |||
| 84 | # manual dependency additions | ||
| 85 | RPROVIDES_${PN}-core = "${PN}" | ||
| 86 | RRECOMMENDS_${PN}-core = "${PN}-readline" | ||
| 87 | RRECOMMENDS_${PN}-crypt = "openssl" | ||
| 88 | |||
| 89 | # add sitecustomize | ||
| 90 | FILES_${PN}-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py" | ||
| 91 | # ship 2to3 | ||
| 92 | FILES_${PN}-core += "${bindir}/2to3" | ||
| 93 | |||
| 94 | # package libpython2 | ||
| 95 | PACKAGES =+ "lib${PN}2" | ||
| 96 | FILES_lib${PN}2 = "${libdir}/libpython*.so*" | ||
| 97 | |||
| 98 | # additional stuff -dev | ||
| 99 | |||
| 100 | FILES_${PN}-dev = "\ | ||
| 101 | ${includedir} \ | ||
| 102 | ${libdir}/lib*${SOLIBSDEV} \ | ||
| 103 | ${libdir}/*.la \ | ||
| 104 | ${libdir}/*.a \ | ||
| 105 | ${libdir}/*.o \ | ||
| 106 | ${libdir}/pkgconfig \ | ||
| 107 | ${base_libdir}/*.a \ | ||
| 108 | ${base_libdir}/*.o \ | ||
| 109 | ${datadir}/aclocal \ | ||
| 110 | ${datadir}/pkgconfig \ | ||
| 111 | " | ||
| 112 | |||
| 113 | # catch debug extensions (isn't that already in python-core-dbg?) | ||
| 114 | FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" | ||
| 115 | |||
| 116 | # catch all the rest (unsorted) | ||
| 117 | PACKAGES += "${PN}-misc" | ||
| 118 | FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN}" | ||
| 119 | |||
| 120 | # catch manpage | ||
| 121 | PACKAGES += "${PN}-man" | ||
| 122 | FILES_${PN}-man = "${datadir}/man" | ||
| 123 | |||
| 124 | BBCLASSEXTEND = "nativesdk" | ||
