[oe-commits] org.oe.dev python-native 2.5.1 add distutils patch to catch up with newer SWIG versions

mickeyl commit oe at amethyst.openembedded.net
Sat Jul 12 14:18:03 UTC 2008


python-native 2.5.1 add distutils patch to catch up with newer SWIG versions
This fixes the infamous:
TypeError: swig_sources() takes exactly 2 arguments (3 given)

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 690d478f4d430a684e98fdb50ca7905261e0b451
ViewMTN: http://monotone.openembedded.org/revision/info/690d478f4d430a684e98fdb50ca7905261e0b451
Files:
1
packages/python/python-native-2.5.1/catchup-with-swig.patch
packages/python/python-native_2.5.1.bb
Diffs:

#
# mt diff -reb0c98a311b18286f22de5289a92bd065bcd8db3 -r690d478f4d430a684e98fdb50ca7905261e0b451
#
#
#
# add_file "packages/python/python-native-2.5.1/catchup-with-swig.patch"
#  content [7bba0c100105cbbbf93356d5cf23111808a4a8f2]
# 
# patch "packages/python/python-native_2.5.1.bb"
#  from [392d8ca5c7646d682ea0b9a49f56a2863651ee9d]
#    to [6aa6388df8faacade25328d294fb0026f60c7547]
#
============================================================
--- packages/python/python-native-2.5.1/catchup-with-swig.patch	7bba0c100105cbbbf93356d5cf23111808a4a8f2
+++ packages/python/python-native-2.5.1/catchup-with-swig.patch	7bba0c100105cbbbf93356d5cf23111808a4a8f2
@@ -0,0 +1,13 @@
+Index: Python-2.5.1/Lib/distutils/command/build_ext.py
+===================================================================
+--- Python-2.5.1.orig/Lib/distutils/command/build_ext.py
++++ Python-2.5.1/Lib/distutils/command/build_ext.py
+@@ -513,7 +513,7 @@ class build_ext (Command):
+             target_lang=language)
+ 
+ 
+-    def swig_sources (self, sources, extension):
++    def swig_sources (self, sources, extension=None):
+ 
+         """Walk the list of source files in 'sources', looking for SWIG
+         interface (.i) files.  Run SWIG on all that are found, and
============================================================
--- packages/python/python-native_2.5.1.bb	392d8ca5c7646d682ea0b9a49f56a2863651ee9d
+++ packages/python/python-native_2.5.1.bb	6aa6388df8faacade25328d294fb0026f60c7547
@@ -4,15 +4,18 @@ DEPENDS = ""
 SECTION = "devel/python"
 PRIORITY = "optional"
 DEPENDS = ""
-PR = "ml1"
+PR = "ml2"
 
 EXCLUDE_FROM_WORLD = "1"
 
-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 \
-           file://dont-modify-shebang-line.patch;patch=1 \
-           file://default-is-optimized.patch;patch=1"
+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 \
+  file://dont-modify-shebang-line.patch;patch=1 \
+  file://default-is-optimized.patch;patch=1 \
+  file://catchup-with-swig.patch;patch=1 \
+"
 S = "${WORKDIR}/Python-${PV}"
 
 inherit autotools native
@@ -24,11 +27,6 @@ EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""
                 --without-cxx --with-signal-module --with-wctype-functions"
 EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""'
 
-#do_configure() {
-#	# the autofoo stuff is too old to allow regenerating
-#	oe_runconf
-#}
-
 do_stage_append() {
 	install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/
 }






More information about the Openembedded-commits mailing list