From e9de7a29dfc59a02a854ee89b8e3b1e897a83792 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 5 Aug 2006 10:28:21 +0000 Subject: python-native 2.4.0 don't modify first shebang line when installing packages via distutils. closes #1271 --- .../python-native-2.4.0/dont-modify-shebang-line.patch | 16 ++++++++++++++++ packages/python/python-native_2.4.0.bb | 10 ++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 packages/python/python-native-2.4.0/dont-modify-shebang-line.patch (limited to 'packages/python') diff --git a/packages/python/python-native-2.4.0/dont-modify-shebang-line.patch b/packages/python/python-native-2.4.0/dont-modify-shebang-line.patch new file mode 100644 index 0000000000..54109afd62 --- /dev/null +++ b/packages/python/python-native-2.4.0/dont-modify-shebang-line.patch @@ -0,0 +1,16 @@ + +# +# Signed off by Michael 'Mickey' Lauer +# + +--- Python-2.4/Lib/distutils/command/build_scripts.py~dont-modify-shebang-line ++++ Python-2.4/Lib/distutils/command/build_scripts.py +@@ -87,7 +87,7 @@ + continue + + match = first_line_re.match(first_line) +- if match: ++ if False: #match: + adjust = 1 + post_interp = match.group(1) or '' + diff --git a/packages/python/python-native_2.4.0.bb b/packages/python/python-native_2.4.0.bb index 00092d1e15..4f5db82569 100644 --- a/packages/python/python-native_2.4.0.bb +++ b/packages/python/python-native_2.4.0.bb @@ -5,13 +5,14 @@ SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " DEPENDS = "" -PR = "r0" +PR = "r1" EXCLUDE_FROM_WORLD = "1" SRC_URI = "http://www.python.org/ftp/python/2.4/Python-2.4.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://cross-distutils.patch;patch=1" + file://bindir-libdir.patch;patch=1 \ + file://cross-distutils.patch;patch=1 \ + file://dont-modify-shebang-line.patch;patch=1" S = "${WORKDIR}/Python-2.4" inherit autotools native @@ -20,7 +21,8 @@ EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --without-cxx -- --with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/${BUILD_SYS}" EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' -do_configure () { +do_configure() { + # the autofoo stuff is too old to allow regenerating oe_runconf } -- cgit v1.2.3 From 7f055c4ffb2bddec2da28bbf35069ef28396cd5b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 5 Aug 2006 10:29:04 +0000 Subject: python-native 2.3.3 remove --- packages/python/python-native-2.3.3/.mtn2git_empty | 0 .../python/python-native-2.3.3/bindir-libdir.patch | 18 ---------- .../python-native-2.3.3/cross-distutils.patch | 38 ---------------------- packages/python/python-native_2.3.3.bb | 29 ----------------- 4 files changed, 85 deletions(-) delete mode 100644 packages/python/python-native-2.3.3/.mtn2git_empty delete mode 100644 packages/python/python-native-2.3.3/bindir-libdir.patch delete mode 100644 packages/python/python-native-2.3.3/cross-distutils.patch delete mode 100644 packages/python/python-native_2.3.3.bb (limited to 'packages/python') diff --git a/packages/python/python-native-2.3.3/.mtn2git_empty b/packages/python/python-native-2.3.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/python/python-native-2.3.3/bindir-libdir.patch b/packages/python/python-native-2.3.3/bindir-libdir.patch deleted file mode 100644 index 999bddc449..0000000000 --- a/packages/python/python-native-2.3.3/bindir-libdir.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Python-2.3.1/Makefile.pre.in~bindir-libdir 2003-09-20 12:50:28.000000000 +0200 -+++ Python-2.3.1/Makefile.pre.in 2003-11-02 19:53:17.000000000 +0100 -@@ -78,8 +78,8 @@ - exec_prefix= @exec_prefix@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include diff --git a/packages/python/python-native-2.3.3/cross-distutils.patch b/packages/python/python-native-2.3.3/cross-distutils.patch deleted file mode 100644 index 76ae883c1d..0000000000 --- a/packages/python/python-native-2.3.3/cross-distutils.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Python-2.3.3/Lib/distutils/sysconfig.py~cross-distutils 2003-02-10 15:02:33.000000000 +0100 -+++ Python-2.3.3/Lib/distutils/sysconfig.py 2004-03-02 20:15:05.000000000 +0100 -@@ -19,8 +19,8 @@ - from errors import DistutilsPlatformError - - # These are needed in a couple of spots, so just compute them once. --PREFIX = os.path.normpath(sys.prefix) --EXEC_PREFIX = os.path.normpath(sys.exec_prefix) -+PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) -+EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - # python_build: (Boolean) if true, we're either building Python or - # building an extension with an un-installed Python, so we use -@@ -192,7 +192,8 @@ - else: - # The name of the config.h file changed in 2.2 - config_h = 'pyconfig.h' -- return os.path.join(inc_dir, config_h) -+ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded" -+ return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def get_makefile_filename(): -@@ -200,7 +201,8 @@ - if python_build: - return os.path.join(os.path.dirname(sys.executable), "Makefile") - lib_dir = get_python_lib(plat_specific=1, standard_lib=1) -- return os.path.join(lib_dir, "config", "Makefile") -+ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded" -+ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def parse_config_h(fp, g=None): diff --git a/packages/python/python-native_2.3.3.bb b/packages/python/python-native_2.3.3.bb deleted file mode 100644 index 8f2e782a7b..0000000000 --- a/packages/python/python-native_2.3.3.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Python Programming Language" -HOMEPAGE = "http://www.python.org" -LICENSE = "PSF" -SECTION = "devel/python" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -DEPENDS = "" -PR = "r1" - -SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://cross-distutils.patch;patch=1" -S = "${WORKDIR}/Python-${PV}" - -inherit autotools native - -EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --without-cxx --with-signal-module --with-wctype-functions \ - --with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/${BUILD_SYS}" -EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' - -do_configure () { - oe_runconf -} - -do_stage_append() { - # install pgen for later usage with non-native builds - install Parser/pgen ${STAGING_DIR}/${BUILD_SYS}/bin/ -} - -- cgit v1.2.3 From 803427eedbf62d58bd250d577f2c0afb5b68383d Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 5 Aug 2006 14:01:52 +0000 Subject: packages: sed -i s/^"include "/"require "/ */*.bb GNU sed rocks! Use require for the BitBake files within packages. In contrast to the conf files the authors of these files expected these files to be included. --- packages/python/python-pyrex-native_0.9.3.bb | 2 +- packages/python/python-scons-native_0.96.90.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/python') diff --git a/packages/python/python-pyrex-native_0.9.3.bb b/packages/python/python-pyrex-native_0.9.3.bb index f06f6388a6..d7ec81fd8e 100644 --- a/packages/python/python-pyrex-native_0.9.3.bb +++ b/packages/python/python-pyrex-native_0.9.3.bb @@ -1,4 +1,4 @@ -include python-pyrex_${PV}.bb +require python-pyrex_${PV}.bb inherit native DEPENDS = "python-native" RDEPENDS = "" diff --git a/packages/python/python-scons-native_0.96.90.bb b/packages/python/python-scons-native_0.96.90.bb index c106440ed7..31bce5583d 100644 --- a/packages/python/python-scons-native_0.96.90.bb +++ b/packages/python/python-scons-native_0.96.90.bb @@ -1,4 +1,4 @@ -include python-scons_${PV}.bb +require python-scons_${PV}.bb inherit native DEPENDS = "python-native" RDEPENDS = "" -- cgit v1.2.3 From 690e9e12869eb453929481ec5f999bff1e36c9b3 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 6 Aug 2006 15:58:51 +0000 Subject: packages/*/*.bb: Stop GNUism on cp. -d -> -P, -a -> pPR... Fix GNUism on the usage of cp -d as --no-derefence -> -P --deference -> -L -r -> -R -a same as -dpR -> -PpR --- packages/python/python-pyqt4_4.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/python') diff --git a/packages/python/python-pyqt4_4.0.bb b/packages/python/python-pyqt4_4.0.bb index 6cd91e68ec..7550e2314d 100644 --- a/packages/python/python-pyqt4_4.0.bb +++ b/packages/python/python-pyqt4_4.0.bb @@ -63,7 +63,7 @@ do_install() { echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so done - cp -a elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ + cp -pPR elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ } -- cgit v1.2.3