python: Initial commit of python 2.7.1
PATCH 1/2 python: Initial commit of python 2.7.1
--- contrib/python/generate-manifest-2.7.py | 362 ++++++++++++++++++++ recipes/python/python-2.7-manifest.inc | 272 +++++++++++++++ .../00-fix-bindir-libdir-for-cross.patch | 20 ++ .../01-fix-have-long-long-format.patch | 19 + .../01-use-proper-tools-for-cross-build.patch | 169 +++++++++ .../python-2.7.1/02-remove-test-for-cross.patch | 108 ++++++ .../python-2.7.1/03-fix-tkinter-detection.patch | 40 +++ .../python-2.7.1/04-default-is-optimized.patch | 18 + .../05-enable-ctypes-cross-build.patch | 28 ++ .../06-ctypes-libffi-fix-configure.patch | 44 +++ .../10-distutils-fix-swig-parameter.patch | 16 + .../11-distutils-never-modify-shebang-line.patch | 18 + ...2-distutils-prefix-is-inside-staging-area.patch | 60 ++++ .../python-2.7.1/99-ignore-optimization-flag.patch | 19 + recipes/python/python-2.7.1/debug.patch | 27 ++ recipes/python/python-2.7.1/nohostlibs.patch | 29 ++ recipes/python/python-2.7.1/sitecustomize.py | 45 +++ .../00-fix-bindir-libdir-for-cross.patch | 20 ++ .../01-fix-have-long-long-format.patch | 19 + .../01-use-proper-tools-for-cross-build.patch | 169 +++++++++ .../02-remove-test-for-cross.patch | 108 ++++++ .../03-fix-tkinter-detection.patch | 40 +++ .../04-default-is-optimized.patch | 18 + .../05-enable-ctypes-cross-build.patch | 28 ++ .../06-ctypes-libffi-fix-configure.patch | 44 +++ .../10-distutils-fix-swig-parameter.patch | 16 + .../11-distutils-never-modify-shebang-line.patch | 18 + ...2-distutils-prefix-is-inside-staging-area.patch | 60 ++++ .../99-ignore-optimization-flag.patch | 19 + recipes/python/python-native-2.7.1/debug.patch | 27 ++ .../python/python-native-2.7.1/nohostlibs.patch | 29 ++ .../python/python-native-2.7.1/sitecustomize.py | 45 +++ recipes/python/python-native_2.7.1.bb | 39 +++ recipes/python/python2.7.inc | 23 ++ recipes/python/python_2.7.1.bb | 133 +++++++ 35 files changed, 2149 insertions(+), 0 deletions(-) create mode 100755 contrib/python/generate-manifest-2.7.py create mode 100644 recipes/python/python-2.7-manifest.inc create mode 100644 recipes/python/python-2.7.1/00-fix-bindir-libdir-for-cross.patch create mode 100644 recipes/python/python-2.7.1/01-fix-have-long-long-format.patch create mode 100644 recipes/python/python-2.7.1/01-use-proper-tools-for-cross-build.patch create mode 100644 recipes/python/python-2.7.1/02-remove-test-for-cross.patch create mode 100644 recipes/python/python-2.7.1/03-fix-tkinter-detection.patch create mode 100644 recipes/python/python-2.7.1/04-default-is-optimized.patch create mode 100644 recipes/python/python-2.7.1/05-enable-ctypes-cross-build.patch create mode 100644 recipes/python/python-2.7.1/06-ctypes-libffi-fix-configure.patch create mode 100644 recipes/python/python-2.7.1/10-distutils-fix-swig-parameter.patch create mode 100644 recipes/python/python-2.7.1/11-distutils-never-modify-shebang-line.patch create mode 100644 recipes/python/python-2.7.1/12-distutils-prefix-is-inside-staging-area.patch create mode 100644 recipes/python/python-2.7.1/99-ignore-optimization-flag.patch create mode 100644 recipes/python/python-2.7.1/debug.patch create mode 100644 recipes/python/python-2.7.1/nohostlibs.patch create mode 100644 recipes/python/python-2.7.1/sitecustomize.py create mode 100644 recipes/python/python-native-2.7.1/00-fix-bindir-libdir-for-cross.patch create mode 100644 recipes/python/python-native-2.7.1/01-fix-have-long-long-format.patch create mode 100644 recipes/python/python-native-2.7.1/01-use-proper-tools-for-cross-build.patch create mode 100644 recipes/python/python-native-2.7.1/02-remove-test-for-cross.patch create mode 100644 recipes/python/python-native-2.7.1/03-fix-tkinter-detection.patch create mode 100644 recipes/python/python-native-2.7.1/04-default-is-optimized.patch create mode 100644 recipes/python/python-native-2.7.1/05-enable-ctypes-cross-build.patch create mode 100644 recipes/python/python-native-2.7.1/06-ctypes-libffi-fix-configure.patch create mode 100644 recipes/python/python-native-2.7.1/10-distutils-fix-swig-parameter.patch create mode 100644 recipes/python/python-native-2.7.1/11-distutils-never-modify-shebang-line.patch create mode 100644 recipes/python/python-native-2.7.1/12-distutils-prefix-is-inside-staging-area.patch create mode 100644 recipes/python/python-native-2.7.1/99-ignore-optimization-flag.patch create mode 100644 recipes/python/python-native-2.7.1/debug.patch create mode 100644 recipes/python/python-native-2.7.1/nohostlibs.patch create mode 100644 recipes/python/python-native-2.7.1/sitecustomize.py create mode 100644 recipes/python/python-native_2.7.1.bb create mode 100644 recipes/python/python2.7.inc create mode 100644 recipes/python/python_2.7.1.bb
contrib/python/generate-manifest-2.7.py new file +362 -0
@@ -0,0 +1,362 @@ +#!/usr/bin/env python + +# generate Python Manifest for the OpenEmbedded build system +# (C) 2002-2010 Michael 'Mickey' Lauer <[email protected]> +# (C) 2007 Jeremy Laine +# licensed under MIT, see COPYING.MIT + +import os +import sys +import time + +VERSION = "2.7.1" + +__author__ = "Michael 'Mickey' Lauer <[email protected]>" +__version__ = "20100908" + +class MakefileMaker: + + def __init__( self, outfile ): + """initialize""" + self.packages = {} + self.targetPrefix = "${libdir}/python%s/" % VERSION[:3] + self.output = outfile + self.out( """ +# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. +# Generator: '%s' Version %s (C) 2002-2010 Michael 'Mickey' Lauer <[email protected]> +# Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy +""" % ( sys.argv[0], __version__ ) ) + + # + # helper functions + # + + def out( self, data ): + """print a line to the output file""" + self.output.write( "%s\n" % data ) + + def setPrefix( self, targetPrefix ): + """set a file prefix for addPackage files""" + self.targetPrefix = targetPrefix + + def doProlog( self ): + self.out( """ """ ) + self.out( "" ) + + def addPackage( self, name, description, dependencies, filenames ): + """add a package to the Makefile""" + if type( filenames ) == type( "" ): + filenames = filenames.split() + fullFilenames = [] + for filename in filenames: + if filename[0] != "$": + fullFilenames.append( "%s%s" % ( self.targetPrefix, filename ) ) + else: + fullFilenames.append( filename ) + self.packages[name] = description, dependencies, fullFilenames + + def doBody( self ): + """generate body of Makefile""" + + global VERSION + + # + # generate provides line + # + + provideLine = 'PROVIDES+="' + for name in self.packages: + provideLine += "%s " % name + provideLine += '"' + + self.out( provideLine ) + self.out( "" ) + + # + # generate package line + # + + packageLine = 'PACKAGES="python-core-dbg ' + for name in self.packages: + if name != 'python-core-dbg': + packageLine += "%s " % name + packageLine += 'python-modules"' + + self.out( packageLine ) + self.out( "" ) + + # + # generate package variables + # + + for name, data in self.packages.iteritems(): + desc, deps, files = data + + # + # write out the description, revision and dependencies + # + self.out( 'DESCRIPTION_%s="%s"' % ( name, desc ) ) + self.out( 'RDEPENDS_%s="%s"' % ( name, deps ) ) + + line = 'FILES_%s="' % name + + # + # check which directories to make in the temporary directory + # + + dirset = {} # if python had a set-datatype this would be sufficient. for now, we're using a dict instead. + for target in files: + dirset[os.path.dirname( target )] = True + + # + # generate which files to copy for the target (-dfR because whole directories are also allowed) + # + + for target in files: + line += "%s " % target + + line += '"' + self.out( line ) + self.out( "" ) + + self.out( 'DESCRIPTION_python-modules="All Python modules"' ) + line = 'RDEPENDS_python-modules="' + + for name, data in self.packages.iteritems(): + if name not in ['python-core-dbg', 'python-dev']: + line += "%s " % name + + self.out( "%s \"" % line ) + self.out( 'ALLOW_EMPTY_python-modules = "1"' ) + + def doEpilog( self ): + self.out( """""" ) + self.out( "" ) + + def make( self ): + self.doProlog() + self.doBody() + self.doEpilog() + +if __name__ == "__main__": + + if len( sys.argv ) > 1: + os.popen( "rm -f ./%s" % sys.argv[1] ) + outfile = file( sys.argv[1], "w" ) + else: + outfile = sys.stdout + + m = MakefileMaker( outfile ) + + # Add packages here. Only specify dlopen-style library dependencies here, no ldd-style dependencies! + # Parameters: revision, name, description, dependencies, filenames + # + + m.addPackage( "python-core", "Python Interpreter and core modules (needed!)", "", + "__future__.* _abcoll.* abc.* copy.* copy_reg.* ConfigParser.* " + + "genericpath.* getopt.* linecache.* new.* " + + "os.* posixpath.* struct.* " + + "warnings.* site.* stat.* " + + "UserDict.* UserList.* UserString.* " + + "lib-dynload/binascii.so lib-dynload/_struct.so lib-dynload/time.so " + + "lib-dynload/xreadlines.so types.* platform.* ${bindir}/python*" ) + + m.addPackage( "python-core-dbg", "Python core module debug information", "python-core", + "config/.debug lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug" ) + + m.addPackage( "python-dev", "Python Development Package", "python-core", + "${includedir} ${libdir}/libpython2.6.so config" ) # package + + m.addPackage( "python-idle", "Python Integrated Development Environment", "python-core python-tkinter", + "${bindir}/idle idlelib" ) # package + + m.addPackage( "python-pydoc", "Python Interactive Help Support", "python-core python-lang python-stringold python-re", + "${bindir}/pydoc pydoc.*" ) + + m.addPackage( "python-smtpd", "Python Simple Mail Transport Daemon", "python-core python-netserver python-email python-mime", + "${bindir}/smtpd.*" ) + + m.addPackage( "python-audio", "Python Audio Handling", "python-core", + "wave.* chunk.* sndhdr.* lib-dynload/ossaudiodev.so lib-dynload/audioop.so" ) + + m.addPackage( "python-bsddb", "Python Berkeley Database Bindings", "python-core", + "bsddb lib-dynload/_bsddb.so" ) # package + + m.addPackage( "python-codecs", "Python Codecs, Encodings & i18n Support", "python-core python-lang", + "codecs.* encodings gettext.* locale.* lib-dynload/_locale.so lib-dynload/unicodedata.so stringprep.* xdrlib.*" ) + + m.addPackage( "python-compile", "Python Bytecode Compilation Support", "python-core", + "py_compile.* compileall.*" ) + + m.addPackage( "python-compiler", "Python Compiler Support", "python-core", + "compiler" ) # package + + m.addPackage( "python-compression", "Python High Level Compression Support", "python-core python-zlib", + "gzip.* zipfile.* tarfile.* lib-dynload/bz2.so" ) + + m.addPackage( "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core", + "hashlib.* md5.* sha.* lib-dynload/crypt.so lib-dynload/_hashlib.so lib-dynload/_sha256.so lib-dynload/_sha512.so" ) + + m.addPackage( "python-textutils", "Python Option Parsing, Text Wrapping and Comma-Separated-Value Support", "python-core python-io python-re python-stringold", + "lib-dynload/_csv.so csv.* optparse.* textwrap.*" ) + + m.addPackage( "python-curses", "Python Curses Support", "python-core", + "curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # directory + low level module + + m.addPackage( "python-ctypes", "Python C Types Support", "python-core", + "ctypes lib-dynload/_ctypes.so" ) # directory + low level module + + m.addPackage( "python-datetime", "Python Calendar and Time support", "python-core python-codecs", + "_strptime.* calendar.* lib-dynload/datetime.so" ) + + m.addPackage( "python-db", "Python File-Based Database Support", "python-core", + "anydbm.* dumbdbm.* whichdb.* " ) + + m.addPackage( "python-debugger", "Python Debugger", "python-core python-io python-lang python-re python-stringold python-shell python-pprint", + "bdb.* pdb.*" ) + + m.addPackage( "python-difflib", "Python helpers for computing deltas between objects.", "python-lang python-re", + "difflib.*" ) + + m.addPackage( "python-distutils", "Python Distribution Utilities", "python-core", + "config distutils" ) # package + + m.addPackage( "python-doctest", "Python framework for running examples in docstrings.", "python-core python-lang python-io python-re python-unittest python-debugger python-difflib", + "doctest.*" ) + + # FIXME consider adding to some higher level package + m.addPackage( "python-elementtree", "Python elementree", "python-core", + "lib-dynload/_elementtree.so" ) + + m.addPackage( "python-email", "Python Email Support", "python-core python-io python-re python-mime python-audio python-image python-netclient", + "imaplib.* email" ) # package + + m.addPackage( "python-fcntl", "Python's fcntl Interface", "python-core", + "lib-dynload/fcntl.so" ) + + m.addPackage( "python-hotshot", "Python Hotshot Profiler", "python-core", + "hotshot lib-dynload/_hotshot.so" ) + + m.addPackage( "python-html", "Python HTML Processing", "python-core", + "formatter.* htmlentitydefs.* htmllib.* markupbase.* sgmllib.* " ) + + m.addPackage( "python-gdbm", "Python GNU Database Support", "python-core", + "lib-dynload/gdbm.so" ) + + m.addPackage( "python-image", "Python Graphical Image Handling", "python-core", + "colorsys.* imghdr.* lib-dynload/imageop.so lib-dynload/rgbimg.so" ) + + m.addPackage( "python-io", "Python Low-Level I/O", "python-core python-math", + "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " + + "pipes.* socket.* ssl.* tempfile.* StringIO.* " ) + + m.addPackage( "python-json", "Python JSON Support", "python-core python-math python-re", + "json" ) # package + + m.addPackage( "python-lang", "Python Low-Level Language Support", "python-core", + "lib-dynload/_bisect.so lib-dynload/_collections.so lib-dynload/_heapq.so lib-dynload/_weakref.so lib-dynload/_functools.so " + + "lib-dynload/array.so lib-dynload/itertools.so lib-dynload/operator.so lib-dynload/parser.so " + + "atexit.* bisect.* code.* codeop.* collections.* dis.* functools.* heapq.* inspect.* keyword.* opcode.* symbol.* repr.* token.* " + + "tokenize.* traceback.* linecache.* weakref.*" ) + + m.addPackage( "python-logging", "Python Logging Support", "python-core python-io python-lang python-pickle python-stringold", + "logging" ) # package + + m.addPackage( "python-mailbox", "Python Mailbox Format Support", "python-core python-mime", + "mailbox.*" ) + + m.addPackage( "python-math", "Python Math Support", "python-core", + "lib-dynload/cmath.so lib-dynload/math.so lib-dynload/_random.so random.* sets.*" ) + + m.addPackage( "python-mime", "Python MIME Handling APIs", "python-core python-io", + "mimetools.* uu.* quopri.* rfc822.*" ) + + m.addPackage( "python-mmap", "Python Memory-Mapped-File Support", "python-core python-io", + "lib-dynload/mmap.so " ) + + m.addPackage( "python-multiprocessing", "Python Multiprocessing Support", "python-core python-io python-lang", + "lib-dynload/_multiprocessing.so multiprocessing" ) # package + + m.addPackage( "python-netclient", "Python Internet Protocol Clients", "python-core python-crypt python-datetime python-io python-lang python-logging python-mime", + "*Cookie*.* " + + "base64.* cookielib.* ftplib.* gopherlib.* hmac.* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib.* urllib2.* urlparse.* uuid.* rfc822.* mimetools.*" ) + + m.addPackage( "python-netserver", "Python Internet Protocol Servers", "python-core python-netclient", + "cgi.* *HTTPServer.* SocketServer.*" ) + + m.addPackage( "python-numbers", "Python Number APIs", "python-core python-lang python-re", + "decimal.* numbers.*" ) + + m.addPackage( "python-pickle", "Python Persistence Support", "python-core python-codecs python-io python-re", + "pickle.* shelve.* lib-dynload/cPickle.so" ) + + m.addPackage( "python-pkgutil", "Python Package Extension Utility Support", "python-core", + "pkgutil.*") + + m.addPackage( "python-pprint", "Python Pretty-Print Support", "python-core", + "pprint.*" ) + + m.addPackage( "python-profile", "Python Basic Profiling Support", "python-core python-textutils", + "profile.* pstats.* cProfile.* lib-dynload/_lsprof.so" ) + + m.addPackage( "python-re", "Python Regular Expression APIs", "python-core", + "re.* sre.* sre_compile.* sre_constants* sre_parse.*" ) # _sre is builtin + + m.addPackage( "python-readline", "Python Readline Support", "python-core", + "lib-dynload/readline.so rlcompleter.*" ) + + m.addPackage( "python-resource", "Python Resource Control Interface", "python-core", + "lib-dynload/resource.so" ) + + m.addPackage( "python-shell", "Python Shell-Like Functionality", "python-core python-re", + "cmd.* commands.* dircache.* fnmatch.* glob.* popen2.* shlex.* shutil.*" ) + + m.addPackage( "python-robotparser", "Python robots.txt parser", "python-core python-netclient", + "robotparser.*") + + m.addPackage( "python-subprocess", "Python Subprocess Support", "python-core python-io python-re python-fcntl python-pickle", + "subprocess.*" ) + + m.addPackage( "python-sqlite3", "Python Sqlite3 Database Support", "python-core python-datetime python-lang python-crypt python-io python-threading python-zlib", + "lib-dynload/_sqlite3.so sqlite3/dbapi2.* sqlite3/__init__.* sqlite3/dump.*" ) + + m.addPackage( "python-sqlite3-tests", "Python Sqlite3 Database Support Tests", "python-core python-sqlite3", + "sqlite3/test" ) + + m.addPackage( "python-stringold", "Python String APIs [deprecated]", "python-core python-re", + "lib-dynload/strop.so string.*" ) + + m.addPackage( "python-syslog", "Python Syslog Interface", "python-core", + "lib-dynload/syslog.so" ) + + m.addPackage( "python-terminal", "Python Terminal Controlling Support", "python-core python-io", + "pty.* tty.*" ) + + m.addPackage( "python-tests", "Python Tests", "python-core", + "test" ) # package + + m.addPackage( "python-threading", "Python Threading & Synchronization Support", "python-core python-lang", + "_threading_local.* dummy_thread.* dummy_threading.* mutex.* threading.* Queue.*" ) + + m.addPackage( "python-tkinter", "Python Tcl/Tk Bindings", "python-core", + "lib-dynload/_tkinter.so lib-tk" ) # package + + m.addPackage( "python-unittest", "Python Unit Testing Framework", "python-core python-stringold python-lang", + "unittest.*" ) + + m.addPackage( "python-unixadmin", "Python Unix Administration Support", "python-core", + "lib-dynload/nis.so lib-dynload/grp.so lib-dynload/pwd.so getpass.*" ) + + m.addPackage( "python-xml", "Python basic XML support.", "python-core python-re", + "lib-dynload/pyexpat.so xml xmllib.*" ) # package + + m.addPackage( "python-xmlrpc", "Python XMLRPC Support", "python-core python-xml python-netserver python-lang", + "xmlrpclib.* SimpleXMLRPCServer.*" ) + + m.addPackage( "python-zlib", "Python zlib Support.", "python-core", + "lib-dynload/zlib.so" ) + + m.addPackage( "python-mailbox", "Python Mailbox Format Support", "python-core python-mime", + "mailbox.*" ) + + m.make()
recipes/python/python-2.7-manifest.inc new file +272 -0
272 lines not on this page · raw message
recipes/python/python-2.7.1/00-fix-bindir-libdir-for-cross.patch new file +20 -0
@@ -0,0 +1,20 @@ +# $(exec_prefix) points to the wrong directory, when installing +# a cross-build. @bindir@ and @libdir@ works better and doesn't +# affect the native build. +# Signed-Off: Michael 'Mickey' Lauer <[email protected]> + +Index: Python-2.6.1/Makefile.pre.in +=================================================================== +--- Python-2.6.1.orig/Makefile.pre.in ++++ Python-2.6.1/Makefile.pre.in +@@ -86,8 +86,8 @@ exec_prefix= @exec_prefix@ + datarootdir= @datarootdir@ + + # Expanded directories +-BINDIR= $(exec_prefix)/bin +-LIBDIR= $(exec_prefix)/lib ++BINDIR= @bindir@ ++LIBDIR= @libdir@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ + CONFINCLUDEDIR= $(exec_prefix)/include
recipes/python/python-2.7.1/01-fix-have-long-long-format.patch new file +19 -0
@@ -0,0 +1,19 @@ +# The configure script assumes the %lld printf format is not available as it +# can't run its check script. For some reason python refuses to compile without +# this functionality, so we just assume that our printf supports %lld. +# +# Include/pyport.h:243:13: error: #error "This platform's pyconfig.h needs to define PY_FORMAT_LONG_LONG" + +Index: Python-2.7.1/configure.in +=================================================================== +--- Python-2.7.1.orig/configure.in ++++ Python-2.7.1/configure.in +@@ -4151,7 +4151,7 @@ then + ]]])], + [ac_cv_have_long_long_format=yes], + [ac_cv_have_long_long_format=no], +- [ac_cv_have_long_long_format=no]) ++ [ac_cv_have_long_long_format=yes]) + ) + AC_MSG_RESULT($ac_cv_have_long_long_format) + fi
recipes/python/python-2.7.1/01-use-proper-tools-for-cross-build.patch new file +169 -0
169 lines not on this page · raw message
recipes/python/python-2.7.1/02-remove-test-for-cross.patch new file +108 -0
108 lines not on this page · raw message
recipes/python/python-2.7.1/03-fix-tkinter-detection.patch new file +40 -0
@@ -0,0 +1,40 @@ +# We need to supply STAGING_INCDIR here, otherwise the Tk headers +# will not be found. +# Signed-Off: Michael 'Mickey' Lauer <[email protected]> + +Index: Python-2.7.1/setup.py +=================================================================== +--- Python-2.7.1.orig/setup.py 2010-12-26 10:01:38.992621096 -0500 ++++ Python-2.7.1/setup.py 2010-12-26 10:02:31.032604626 -0500 +@@ -1712,7 +1712,7 @@ + dotversion = dotversion[:-1] + '.' + dotversion[-1] + tcl_include_sub = [] + tk_include_sub = [] +- for dir in inc_dirs: ++ for dir in [os.getenv("STAGING_INCDIR")]: + tcl_include_sub += [dir + os.sep + "tcl" + dotversion] + tk_include_sub += [dir + os.sep + "tk" + dotversion] + tk_include_sub += tcl_include_sub +@@ -1731,22 +1731,6 @@ + if dir not in include_dirs: + include_dirs.append(dir) + +- # Check for various platform-specific directories +- if platform == 'sunos5': +- include_dirs.append('/usr/openwin/include') +- added_lib_dirs.append('/usr/openwin/lib') +- elif os.path.exists('/usr/X11R6/include'): +- include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') +- elif os.path.exists('/usr/X11R5/include'): +- include_dirs.append('/usr/X11R5/include') +- added_lib_dirs.append('/usr/X11R5/lib') +- else: +- # Assume default location for X11 +- include_dirs.append('/usr/X11/include') +- added_lib_dirs.append('/usr/X11/lib') +- + # If Cygwin, then verify that X is installed before proceeding + if platform == 'cygwin': + x11_inc = find_file('X11/Xlib.h', [], include_dirs)
recipes/python/python-2.7.1/04-default-is-optimized.patch new file +18 -0
@@ -0,0 +1,18 @@ +# When compiling for an embedded system, we need every bit of +# performance we can get. default to optimized with the option +# of opt-out. +# Signed-Off: Michael 'Mickey' Lauer <[email protected]> + +Index: Python-2.6.1/Python/compile.c +=================================================================== +--- Python-2.6.1.orig/Python/compile.c ++++ Python-2.6.1/Python/compile.c +@@ -32,7 +32,7 @@ + #include "symtable.h" + #include "opcode.h" + +-int Py_OptimizeFlag = 0; ++int Py_OptimizeFlag = 1; + + #define DEFAULT_BLOCK_SIZE 16 + #define DEFAULT_BLOCKS 8
recipes/python/python-2.7.1/05-enable-ctypes-cross-build.patch new file +28 -0
@@ -0,0 +1,28 @@ +# CTypes need to know the actual host we are building on. +# Signed-Off: Michael Dietrich <[email protected]> + +Index: Python-2.7.1/setup.py +=================================================================== +--- Python-2.7.1.orig/setup.py 2010-12-26 10:02:31.032604626 -0500 ++++ Python-2.7.1/setup.py 2010-12-26 10:02:43.182604395 -0500 +@@ -1825,16 +1825,16 @@ + ffi_configfile): + from distutils.dir_util import mkpath + mkpath(ffi_builddir) +- config_args = [] ++ config_args = ['--host=%s' % os.environ["HOST_SYS"], ] + + # Pass empty CFLAGS because we'll just append the resulting + # CFLAGS to Python's; -g or -O2 is to be avoided. +- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \ +- % (ffi_builddir, ffi_srcdir, " ".join(config_args)) ++ cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \ ++ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args)) + + res = os.system(cmd) + if res or not os.path.exists(ffi_configfile): +- print "Failed to configure _ctypes module" ++ print "Failed to configure _ctypes module (res=%d) or missing conffile=%s" % ( res, ffi_configfile ) + return False + + fficonfig = {}
recipes/python/python-2.7.1/06-ctypes-libffi-fix-configure.patch new file +44 -0
44 lines not on this page · raw message
recipes/python/python-2.7.1/10-distutils-fix-swig-parameter.patch new file +16 -0
@@ -0,0 +1,16 @@ +# Some versions of SWIG do not use the extension parameter. +# Make it optional. +# Signed-Off: Michael 'Mickey' Lauer <[email protected]> +Index: Python-2.7.1/Lib/distutils/command/build_ext.py +=================================================================== +--- Python-2.7.1.orig/Lib/distutils/command/build_ext.py 2010-09-10 16:03:17.000000000 -0400 ++++ Python-2.7.1/Lib/distutils/command/build_ext.py 2010-12-26 10:07:28.492632349 -0500 +@@ -531,7 +531,7 @@ + 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
recipes/python/python-2.7.1/11-distutils-never-modify-shebang-line.patch new file +18 -0
@@ -0,0 +1,18 @@ +# Don't modify the she-bang line for a cross-build. +# Otherwise it points to our hostpython (which we do not want) +# +# Signed-Off: Michael 'Mickey' Lauer <[email protected]> + +Index: Python-2.7.1/Lib/distutils/command/build_scripts.py +=================================================================== +--- Python-2.7.1.orig/Lib/distutils/command/build_scripts.py 2010-01-23 04:23:15.000000000 -0500 ++++ Python-2.7.1/Lib/distutils/command/build_scripts.py 2010-12-26 10:07:35.762597668 -0500 +@@ -85,7 +85,7 @@ + continue + + match = first_line_re.match(first_line) +- if match: ++ if False: #match: + adjust = 1 + post_interp = match.group(1) or '' +
recipes/python/python-2.7.1/12-distutils-prefix-is-inside-staging-area.patch new file +60 -0
60 lines not on this page · raw message
recipes/python/python-2.7.1/99-ignore-optimization-flag.patch new file +19 -0
@@ -0,0 +1,19 @@ +# Reinstate the empty -O option to fix weird mixing of native and target +# binaries and libraries with LD_LIBRARY_PATH when host==target +# +# Signed-off-by: Denys Dmytriyenko <[email protected]> + +Index: Python-2.7.1/Modules/main.c +=================================================================== +--- Python-2.7.1.orig/Modules/main.c 2010-06-13 02:50:39.000000000 -0400 ++++ Python-2.7.1/Modules/main.c 2010-12-26 10:09:34.300455892 -0500 +@@ -329,8 +329,7 @@ + + /* case 'J': reserved for Jython */ + +- case 'O': +- Py_OptimizeFlag++; ++ case 'O': /* ignore it */ + break; + + case 'B':
recipes/python/python-2.7.1/debug.patch new file +27 -0
@@ -0,0 +1,27 @@ +Index: Python-2.7.1/Lib/distutils/unixccompiler.py +=================================================================== +--- Python-2.7.1.orig/Lib/distutils/unixccompiler.py 2010-06-27 08:36:16.000000000 -0400 ++++ Python-2.7.1/Lib/distutils/unixccompiler.py 2010-12-26 10:09:44.282632589 -0500 +@@ -318,6 +318,8 @@ + + + ++ print "Looking in %s for %s" % (lib, dirs) ++ + for dir in dirs: + shared = os.path.join(dir, shared_f) + dylib = os.path.join(dir, dylib_f) +@@ -336,10 +338,13 @@ + # assuming that *all* Unix C compilers do. And of course I'm + # ignoring even GCC's "-static" option. So sue me. + if os.path.exists(dylib): ++ print "Found %s" % (dylib) + return dylib + elif os.path.exists(shared): ++ print "Found %s" % (shared) + return shared + elif os.path.exists(static): ++ print "Found %s" % (static) + return static + + # Oops, didn't find it in *any* of 'dirs'
recipes/python/python-2.7.1/nohostlibs.patch new file +29 -0
@@ -0,0 +1,29 @@ +Index: Python-2.7.1/setup.py +=================================================================== +--- Python-2.7.1.orig/setup.py 2010-12-26 10:02:43.000000000 -0500 ++++ Python-2.7.1/setup.py 2010-12-26 10:12:30.920427195 -0500 +@@ -404,11 +404,8 @@ + # lib_dirs and inc_dirs are used to search for files; + # if a file is found in one of those directories, it can + # be assumed that no additional -I,-L directives are needed. +- lib_dirs = self.compiler.library_dirs + [ +- '/lib64', '/usr/lib64', +- '/lib', '/usr/lib', +- ] +- inc_dirs = self.compiler.include_dirs + ['/usr/include'] ++ lib_dirs = self.compiler.library_dirs ++ inc_dirs = self.compiler.include_dirs + exts = [] + missing = [] + +@@ -657,9 +654,7 @@ + pass # Issue 7384: Already linked against curses or tinfo. + elif curses_library: + readline_libs.append(curses_library) +- elif self.compiler.find_library_file(lib_dirs + +- ['/usr/lib/termcap'], +- 'termcap'): ++ elif self.compiler.find_library_file(lib_dirs, 'termcap'): + readline_libs.append('termcap') + exts.append( Extension('readline', ['readline.c'], + library_dirs=['/usr/lib/termcap'],
recipes/python/python-2.7.1/sitecustomize.py new file +45 -0
45 lines not on this page · raw message
recipes/python/python-native-2.7.1/00-fix-bindir-libdir-for-cross.patch new file +20 -0
@@ -0,0 +1,20 @@ +# $(exec_prefix) points to the wrong directory, when installing +# a cross-build. @bindir@ and @libdir@ works better and doesn't +# affect the native build. +# Signed-Off: Michael 'Mickey' Lauer <[email protected]> + +Index: Python-2.6.1/Makefile.pre.in +=================================================================== +--- Python-2.6.1.orig/Makefile.pre.in ++++ Python-2.6.1/Makefile.pre.in +@@ -86,8 +86,8 @@ exec_prefix= @exec_prefix@ + datarootdir= @datarootdir@ + + # Expanded directories +-BINDIR= $(exec_prefix)/bin +-LIBDIR= $(exec_prefix)/lib ++BINDIR= @bindir@ ++LIBDIR= @libdir@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ + CONFINCLUDEDIR= $(exec_prefix)/include
recipes/python/python-native-2.7.1/01-fix-have-long-long-format.patch new file +19 -0
@@ -0,0 +1,19 @@ +# The configure script assumes the %lld printf format is not available as it +# can't run its check script. For some reason python refuses to compile without +# this functionality, so we just assume that our printf supports %lld. +# +# Include/pyport.h:243:13: error: #error "This platform's pyconfig.h needs to define PY_FORMAT_LONG_LONG" + +Index: Python-2.7.1/configure.in +=================================================================== +--- Python-2.7.1.orig/configure.in ++++ Python-2.7.1/configure.in +@@ -4151,7 +4151,7 @@ then + ]]])], + [ac_cv_have_long_long_format=yes], + [ac_cv_have_long_long_format=no], +- [ac_cv_have_long_long_format=no]) ++ [ac_cv_have_long_long_format=yes]) + ) + AC_MSG_RESULT($ac_cv_have_long_long_format) + fi
recipes/python/python-native-2.7.1/01-use-proper-tools-for-cross-build.patch new file +169 -0
169 lines not on this page · raw message
recipes/python/python-native-2.7.1/02-remove-test-for-cross.patch new file +108 -0
108 lines not on this page · raw message
recipes/python/python-native-2.7.1/03-fix-tkinter-detection.patch new file +40 -0
@@ -0,0 +1,40 @@ +# We need to supply STAGING_INCDIR here, otherwise the Tk headers +# will not be found. +# Signed-Off: Michael 'Mickey' Lauer <[email protected]> + +Index: Python-2.7.1/setup.py +=================================================================== +--- Python-2.7.1.orig/setup.py 2010-12-26 10:01:38.992621096 -0500 ++++ Python-2.7.1/setup.py 2010-12-26 10:02:31.032604626 -0500 +@@ -1712,7 +1712,7 @@ + dotversion = dotversion[:-1] + '.' + dotversion[-1] + tcl_include_sub = [] + tk_include_sub = [] +- for dir in inc_dirs: ++ for dir in [os.getenv("STAGING_INCDIR")]: + tcl_include_sub += [dir + os.sep + "tcl" + dotversion] + tk_include_sub += [dir + os.sep + "tk" + dotversion] + tk_include_sub += tcl_include_sub +@@ -1731,22 +1731,6 @@ + if dir not in include_dirs: + include_dirs.append(dir) + +- # Check for various platform-specific directories +- if platform == 'sunos5': +- include_dirs.append('/usr/openwin/include') +- added_lib_dirs.append('/usr/openwin/lib') +- elif os.path.exists('/usr/X11R6/include'): +- include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') +- elif os.path.exists('/usr/X11R5/include'): +- include_dirs.append('/usr/X11R5/include') +- added_lib_dirs.append('/usr/X11R5/lib') +- else: +- # Assume default location for X11 +- include_dirs.append('/usr/X11/include') +- added_lib_dirs.append('/usr/X11/lib') +- + # If Cygwin, then verify that X is installed before proceeding + if platform == 'cygwin': + x11_inc = find_file('X11/Xlib.h', [], include_dirs)
recipes/python/python-native-2.7.1/04-default-is-optimized.patch new file +18 -0
@@ -0,0 +1,18 @@ +# When compiling for an embedded system, we need every bit of +# performance we can get. default to optimized with the option +# of opt-out. +# Signed-Off: Michael 'Mickey' Lauer <[email protected]> + +Index: Python-2.6.1/Python/compile.c +=================================================================== +--- Python-2.6.1.orig/Python/compile.c ++++ Python-2.6.1/Python/compile.c +@@ -32,7 +32,7 @@ + #include "symtable.h" + #include "opcode.h" + +-int Py_OptimizeFlag = 0; ++int Py_OptimizeFlag = 1; + + #define DEFAULT_BLOCK_SIZE 16 + #define DEFAULT_BLOCKS 8
recipes/python/python-native-2.7.1/05-enable-ctypes-cross-build.patch new file +28 -0
@@ -0,0 +1,28 @@ +# CTypes need to know the actual host we are building on. +# Signed-Off: Michael Dietrich <[email protected]> + +Index: Python-2.7.1/setup.py +=================================================================== +--- Python-2.7.1.orig/setup.py 2010-12-26 10:02:31.032604626 -0500 ++++ Python-2.7.1/setup.py 2010-12-26 10:02:43.182604395 -0500 +@@ -1825,16 +1825,16 @@ + ffi_configfile): + from distutils.dir_util import mkpath + mkpath(ffi_builddir) +- config_args = [] ++ config_args = ['--host=%s' % os.environ["HOST_SYS"], ] + + # Pass empty CFLAGS because we'll just append the resulting + # CFLAGS to Python's; -g or -O2 is to be avoided. +- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \ +- % (ffi_builddir, ffi_srcdir, " ".join(config_args)) ++ cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \ ++ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args)) + + res = os.system(cmd) + if res or not os.path.exists(ffi_configfile): +- print "Failed to configure _ctypes module" ++ print "Failed to configure _ctypes module (res=%d) or missing conffile=%s" % ( res, ffi_configfile ) + return False + + fficonfig = {}
recipes/python/python-native-2.7.1/06-ctypes-libffi-fix-configure.patch new file +44 -0
44 lines not on this page · raw message
recipes/python/python-native-2.7.1/10-distutils-fix-swig-parameter.patch new file +16 -0
@@ -0,0 +1,16 @@ +# Some versions of SWIG do not use the extension parameter. +# Make it optional. +# Signed-Off: Michael 'Mickey' Lauer <[email protected]> +Index: Python-2.7.1/Lib/distutils/command/build_ext.py +=================================================================== +--- Python-2.7.1.orig/Lib/distutils/command/build_ext.py 2010-09-10 16:03:17.000000000 -0400 ++++ Python-2.7.1/Lib/distutils/command/build_ext.py 2010-12-26 10:07:28.492632349 -0500 +@@ -531,7 +531,7 @@ + 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
recipes/python/python-native-2.7.1/11-distutils-never-modify-shebang-line.patch new file +18 -0
@@ -0,0 +1,18 @@ +# Don't modify the she-bang line for a cross-build. +# Otherwise it points to our hostpython (which we do not want) +# +# Signed-Off: Michael 'Mickey' Lauer <[email protected]> + +Index: Python-2.7.1/Lib/distutils/command/build_scripts.py +=================================================================== +--- Python-2.7.1.orig/Lib/distutils/command/build_scripts.py 2010-01-23 04:23:15.000000000 -0500 ++++ Python-2.7.1/Lib/distutils/command/build_scripts.py 2010-12-26 10:07:35.762597668 -0500 +@@ -85,7 +85,7 @@ + continue + + match = first_line_re.match(first_line) +- if match: ++ if False: #match: + adjust = 1 + post_interp = match.group(1) or '' +
recipes/python/python-native-2.7.1/12-distutils-prefix-is-inside-staging-area.patch new file +60 -0
60 lines not on this page · raw message
recipes/python/python-native-2.7.1/99-ignore-optimization-flag.patch new file +19 -0
@@ -0,0 +1,19 @@ +# Reinstate the empty -O option to fix weird mixing of native and target +# binaries and libraries with LD_LIBRARY_PATH when host==target +# +# Signed-off-by: Denys Dmytriyenko <[email protected]> + +Index: Python-2.7.1/Modules/main.c +=================================================================== +--- Python-2.7.1.orig/Modules/main.c 2010-06-13 02:50:39.000000000 -0400 ++++ Python-2.7.1/Modules/main.c 2010-12-26 10:09:34.300455892 -0500 +@@ -329,8 +329,7 @@ + + /* case 'J': reserved for Jython */ + +- case 'O': +- Py_OptimizeFlag++; ++ case 'O': /* ignore it */ + break; + + case 'B':
recipes/python/python-native-2.7.1/debug.patch new file +27 -0
@@ -0,0 +1,27 @@ +Index: Python-2.7.1/Lib/distutils/unixccompiler.py +=================================================================== +--- Python-2.7.1.orig/Lib/distutils/unixccompiler.py 2010-06-27 08:36:16.000000000 -0400 ++++ Python-2.7.1/Lib/distutils/unixccompiler.py 2010-12-26 10:09:44.282632589 -0500 +@@ -318,6 +318,8 @@ + + + ++ print "Looking in %s for %s" % (lib, dirs) ++ + for dir in dirs: + shared = os.path.join(dir, shared_f) + dylib = os.path.join(dir, dylib_f) +@@ -336,10 +338,13 @@ + # assuming that *all* Unix C compilers do. And of course I'm + # ignoring even GCC's "-static" option. So sue me. + if os.path.exists(dylib): ++ print "Found %s" % (dylib) + return dylib + elif os.path.exists(shared): ++ print "Found %s" % (shared) + return shared + elif os.path.exists(static): ++ print "Found %s" % (static) + return static + + # Oops, didn't find it in *any* of 'dirs'
recipes/python/python-native-2.7.1/nohostlibs.patch new file +29 -0
@@ -0,0 +1,29 @@ +Index: Python-2.7.1/setup.py +=================================================================== +--- Python-2.7.1.orig/setup.py 2010-12-26 10:02:43.000000000 -0500 ++++ Python-2.7.1/setup.py 2010-12-26 10:12:30.920427195 -0500 +@@ -404,11 +404,8 @@ + # lib_dirs and inc_dirs are used to search for files; + # if a file is found in one of those directories, it can + # be assumed that no additional -I,-L directives are needed. +- lib_dirs = self.compiler.library_dirs + [ +- '/lib64', '/usr/lib64', +- '/lib', '/usr/lib', +- ] +- inc_dirs = self.compiler.include_dirs + ['/usr/include'] ++ lib_dirs = self.compiler.library_dirs ++ inc_dirs = self.compiler.include_dirs + exts = [] + missing = [] + +@@ -657,9 +654,7 @@ + pass # Issue 7384: Already linked against curses or tinfo. + elif curses_library: + readline_libs.append(curses_library) +- elif self.compiler.find_library_file(lib_dirs + +- ['/usr/lib/termcap'], +- 'termcap'): ++ elif self.compiler.find_library_file(lib_dirs, 'termcap'): + readline_libs.append('termcap') + exts.append( Extension('readline', ['readline.c'], + library_dirs=['/usr/lib/termcap'],
recipes/python/python-native-2.7.1/sitecustomize.py new file +45 -0
45 lines not on this page · raw message
recipes/python/python-native_2.7.1.bb new file +39 -0
@@ -0,0 +1,39 @@ +require python2.7.inc +DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native" +PR = "${INC_PR}.1" +DEFAULT_PREFERENCE = "-1" + +FILESPATHPKG .= ":python-${PV}:python" +SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ + file://04-default-is-optimized.patch \ + file://05-enable-ctypes-cross-build.patch \ + file://06-ctypes-libffi-fix-configure.patch \ + file://10-distutils-fix-swig-parameter.patch \ + file://11-distutils-never-modify-shebang-line.patch \ + file://12-distutils-prefix-is-inside-staging-area.patch \ + file://debug.patch \ + file://nohostlibs.patch" +SRC_URI[md5sum] = "aa27bc25725137ba155910bd8e5ddc4f" +SRC_URI[sha256sum] = "80e387bcf57eae8ce26726753584fd63e060ec11682d1145af921e85fd612292" + +S = "${WORKDIR}/Python-${PV}" + +inherit native + +EXTRA_OECONF_append = '\ + --enable-unicode=ucs4 \ +' + +EXTRA_OEMAKE = '\ + BUILD_SYS="" \ + HOST_SYS="" \ + LIBC="" \ + STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \ + STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \ +' + +do_install() { + oe_runmake 'DESTDIR=${D}' install + install -d ${D}${bindir}/ + install -m 0755 Parser/pgen ${D}${bindir}/ +}
recipes/python/python2.7.inc new file +23 -0
@@ -0,0 +1,23 @@ +DESCRIPTION = "The Python Programming Language" +HOMEPAGE = "http://www.python.org" +LICENSE = "PSF" +SECTION = "devel/python" +PRIORITY = "optional" +# bump this on every change in contrib/python/generate-manifest-2.7.py +INC_PR = "ml1" + +DEFAULT_PREFERENCE = "-27" + +PYTHON_MAJMIN = "2.7" + +inherit autotools + +EXTRA_OECONF = "\ + --with-threads \ + --with-pymalloc \ + --with-cyclic-gc \ + --without-cxx \ + --with-signal-module \ + --with-wctype-functions \ + --enable-shared \ +"
recipes/python/python_2.7.1.bb new file +133 -0
133 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 1/1 python-native: drop old versions 2.6.1 and 2.6.4, remove unneeded python-native-* directories
* python-native-2.7.1 is the same as python-2.7.1 and thanks to FILESPATHPKG .= ':python-:python' it's not needed to keep it twice
--- .../00-fix-bindir-libdir-for-cross.patch | 20 --- .../04-default-is-optimized.patch | 18 -- .../10-distutils-fix-swig-parameter.patch | 16 -- .../11-distutils-never-modify-shebang-line.patch | 18 -- ...2-distutils-prefix-is-inside-staging-area.patch | 60 ------- recipes/python/python-native-2.6.1/debug.patch | 27 --- .../python/python-native-2.6.1/nohostlibs.patch | 53 ------ .../python/python-native-2.6.1/sitecustomize.py | 45 ----- .../00-fix-bindir-libdir-for-cross.patch | 20 --- .../04-default-is-optimized.patch | 18 -- .../10-distutils-fix-swig-parameter.patch | 16 -- .../11-distutils-never-modify-shebang-line.patch | 18 -- ...2-distutils-prefix-is-inside-staging-area.patch | 60 ------- recipes/python/python-native-2.6.4/debug.patch | 27 --- .../python/python-native-2.6.4/nohostlibs.patch | 53 ------ .../python/python-native-2.6.4/sitecustomize.py | 45 ----- .../00-fix-bindir-libdir-for-cross.patch | 20 --- .../01-fix-have-long-long-format.patch | 19 --- .../01-use-proper-tools-for-cross-build.patch | 169 -------------------- .../02-remove-test-for-cross.patch | 108 ------------- .../03-fix-tkinter-detection.patch | 40 ----- .../04-default-is-optimized.patch | 18 -- .../05-enable-ctypes-cross-build.patch | 28 ---- .../06-ctypes-libffi-fix-configure.patch | 44 ----- .../10-distutils-fix-swig-parameter.patch | 16 -- .../11-distutils-never-modify-shebang-line.patch | 18 -- ...2-distutils-prefix-is-inside-staging-area.patch | 60 ------- .../99-ignore-optimization-flag.patch | 19 --- recipes/python/python-native-2.7.1/debug.patch | 27 --- .../python/python-native-2.7.1/nohostlibs.patch | 29 ---- .../python/python-native-2.7.1/sitecustomize.py | 45 ----- recipes/python/python-native_2.6.1.bb | 33 ---- recipes/python/python-native_2.6.4.bb | 35 ---- 33 files changed, 0 insertions(+), 1242 deletions(-) delete mode 100644 recipes/python/python-native-2.6.1/00-fix-bindir-libdir-for-cross.patch delete mode 100644 recipes/python/python-native-2.6.1/04-default-is-optimized.patch delete mode 100644 recipes/python/python-native-2.6.1/10-distutils-fix-swig-parameter.patch delete mode 100644 recipes/python/python-native-2.6.1/11-distutils-never-modify-shebang-line.patch delete mode 100644 recipes/python/python-native-2.6.1/12-distutils-prefix-is-inside-staging-area.patch delete mode 100644 recipes/python/python-native-2.6.1/debug.patch delete mode 100644 recipes/python/python-native-2.6.1/nohostlibs.patch delete mode 100644 recipes/python/python-native-2.6.1/sitecustomize.py delete mode 100644 recipes/python/python-native-2.6.4/00-fix-bindir-libdir-for-cross.patch delete mode 100644 recipes/python/python-native-2.6.4/04-default-is-optimized.patch delete mode 100644 recipes/python/python-native-2.6.4/10-distutils-fix-swig-parameter.patch delete mode 100644 recipes/python/python-native-2.6.4/11-distutils-never-modify-shebang-line.patch delete mode 100644 recipes/python/python-native-2.6.4/12-distutils-prefix-is-inside-staging-area.patch delete mode 100644 recipes/python/python-native-2.6.4/debug.patch delete mode 100644 recipes/python/python-native-2.6.4/nohostlibs.patch delete mode 100644 recipes/python/python-native-2.6.4/sitecustomize.py delete mode 100644 recipes/python/python-native-2.7.1/00-fix-bindir-libdir-for-cross.patch delete mode 100644 recipes/python/python-native-2.7.1/01-fix-have-long-long-format.patch delete mode 100644 recipes/python/python-native-2.7.1/01-use-proper-tools-for-cross-build.patch delete mode 100644 recipes/python/python-native-2.7.1/02-remove-test-for-cross.patch delete mode 100644 recipes/python/python-native-2.7.1/03-fix-tkinter-detection.patch delete mode 100644 recipes/python/python-native-2.7.1/04-default-is-optimized.patch delete mode 100644 recipes/python/python-native-2.7.1/05-enable-ctypes-cross-build.patch delete mode 100644 recipes/python/python-native-2.7.1/06-ctypes-libffi-fix-configure.patch delete mode 100644 recipes/python/python-native-2.7.1/10-distutils-fix-swig-parameter.patch delete mode 100644 recipes/python/python-native-2.7.1/11-distutils-never-modify-shebang-line.patch delete mode 100644 recipes/python/python-native-2.7.1/12-distutils-prefix-is-inside-staging-area.patch delete mode 100644 recipes/python/python-native-2.7.1/99-ignore-optimization-flag.patch delete mode 100644 recipes/python/python-native-2.7.1/debug.patch delete mode 100644 recipes/python/python-native-2.7.1/nohostlibs.patch delete mode 100644 recipes/python/python-native-2.7.1/sitecustomize.py delete mode 100644 recipes/python/python-native_2.6.1.bb delete mode 100644 recipes/python/python-native_2.6.4.bb
recipes/python/python-native-2.6.1/00-fix-bindir-libdir-for-cross.patch deleted +0 -20
@@ -1,20 +0,0 @@ -# $(exec_prefix) points to the wrong directory, when installing -# a cross-build. @bindir@ and @libdir@ works better and doesn't -# affect the native build. -# Signed-Off: Michael 'Mickey' Lauer <[email protected]> - -Index: Python-2.6.1/Makefile.pre.in -=================================================================== ---- Python-2.6.1.orig/Makefile.pre.in -+++ Python-2.6.1/Makefile.pre.in -@@ -86,8 +86,8 @@ exec_prefix= @exec_prefix@ - datarootdir= @datarootdir@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include
recipes/python/python-native-2.6.1/04-default-is-optimized.patch deleted +0 -18
@@ -1,18 +0,0 @@ -# When compiling for an embedded system, we need every bit of -# performance we can get. default to optimized with the option -# of opt-out. -# Signed-Off: Michael 'Mickey' Lauer <[email protected]> - -Index: Python-2.6.1/Python/compile.c -=================================================================== ---- Python-2.6.1.orig/Python/compile.c -+++ Python-2.6.1/Python/compile.c -@@ -32,7 +32,7 @@ - #include "symtable.h" - #include "opcode.h" - --int Py_OptimizeFlag = 0; -+int Py_OptimizeFlag = 1; - - #define DEFAULT_BLOCK_SIZE 16 - #define DEFAULT_BLOCKS 8
recipes/python/python-native-2.6.1/10-distutils-fix-swig-parameter.patch deleted +0 -16
@@ -1,16 +0,0 @@ -# Some versions of SWIG do not use the extension parameter. -# Make it optional. -# Signed-Off: Michael 'Mickey' Lauer <[email protected]> -Index: Python-2.6.1/Lib/distutils/command/build_ext.py -=================================================================== ---- Python-2.6.1.orig/Lib/distutils/command/build_ext.py -+++ Python-2.6.1/Lib/distutils/command/build_ext.py -@@ -566,7 +566,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
recipes/python/python-native-2.6.1/11-distutils-never-modify-shebang-line.patch deleted +0 -18
@@ -1,18 +0,0 @@ -# Don't modify the she-bang line for a cross-build. -# Otherwise it points to our hostpython (which we do not want) -# -# Signed-Off: Michael 'Mickey' Lauer <[email protected]> - -Index: Python-2.6.1/Lib/distutils/command/build_scripts.py -=================================================================== ---- Python-2.6.1.orig/Lib/distutils/command/build_scripts.py -+++ Python-2.6.1/Lib/distutils/command/build_scripts.py -@@ -87,7 +87,7 @@ class build_scripts (Command): - continue - - match = first_line_re.match(first_line) -- if match: -+ if False: #match: - adjust = 1 - post_interp = match.group(1) or '' -
recipes/python/python-native-2.6.1/12-distutils-prefix-is-inside-staging-area.patch deleted +0 -60
60 lines not on this page · raw message
recipes/python/python-native-2.6.1/debug.patch deleted +0 -27
@@ -1,27 +0,0 @@ -Index: Python-2.6.1/Lib/distutils/unixccompiler.py -=================================================================== ---- Python-2.6.1.orig/Lib/distutils/unixccompiler.py 2009-11-13 16:04:54.000000000 +0000 -+++ Python-2.6.1/Lib/distutils/unixccompiler.py 2009-11-13 16:06:27.000000000 +0000 -@@ -300,6 +300,8 @@ - dylib_f = self.library_filename(lib, lib_type='dylib') - static_f = self.library_filename(lib, lib_type='static') - -+ print "Looking in %s for %s" % (lib, dirs) -+ - for dir in dirs: - shared = os.path.join(dir, shared_f) - dylib = os.path.join(dir, dylib_f) -@@ -309,10 +311,13 @@ - # assuming that *all* Unix C compilers do. And of course I'm - # ignoring even GCC's "-static" option. So sue me. - if os.path.exists(dylib): -+ print "Found %s" % (dylib) - return dylib - elif os.path.exists(shared): -+ print "Found %s" % (shared) - return shared - elif os.path.exists(static): -+ print "Found %s" % (static) - return static - - # Oops, didn't find it in *any* of 'dirs'
recipes/python/python-native-2.6.1/nohostlibs.patch deleted +0 -53
53 lines not on this page · raw message
recipes/python/python-native-2.6.1/sitecustomize.py deleted +0 -45
45 lines not on this page · raw message
recipes/python/python-native-2.6.4/00-fix-bindir-libdir-for-cross.patch deleted +0 -20
@@ -1,20 +0,0 @@ -# $(exec_prefix) points to the wrong directory, when installing -# a cross-build. @bindir@ and @libdir@ works better and doesn't -# affect the native build. -# Signed-Off: Michael 'Mickey' Lauer <[email protected]> - -Index: Python-2.6.1/Makefile.pre.in -=================================================================== ---- Python-2.6.1.orig/Makefile.pre.in -+++ Python-2.6.1/Makefile.pre.in -@@ -86,8 +86,8 @@ exec_prefix= @exec_prefix@ - datarootdir= @datarootdir@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include
recipes/python/python-native-2.6.4/04-default-is-optimized.patch deleted +0 -18
@@ -1,18 +0,0 @@ -# When compiling for an embedded system, we need every bit of -# performance we can get. default to optimized with the option -# of opt-out. -# Signed-Off: Michael 'Mickey' Lauer <[email protected]> - -Index: Python-2.6.1/Python/compile.c -=================================================================== ---- Python-2.6.1.orig/Python/compile.c -+++ Python-2.6.1/Python/compile.c -@@ -32,7 +32,7 @@ - #include "symtable.h" - #include "opcode.h" - --int Py_OptimizeFlag = 0; -+int Py_OptimizeFlag = 1; - - #define DEFAULT_BLOCK_SIZE 16 - #define DEFAULT_BLOCKS 8
recipes/python/python-native-2.6.4/10-distutils-fix-swig-parameter.patch deleted +0 -16
@@ -1,16 +0,0 @@ -# Some versions of SWIG do not use the extension parameter. -# Make it optional. -# Signed-Off: Michael 'Mickey' Lauer <[email protected]> -Index: Python-2.6.1/Lib/distutils/command/build_ext.py -=================================================================== ---- Python-2.6.1.orig/Lib/distutils/command/build_ext.py -+++ Python-2.6.1/Lib/distutils/command/build_ext.py -@@ -566,7 +566,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
recipes/python/python-native-2.6.4/11-distutils-never-modify-shebang-line.patch deleted +0 -18
@@ -1,18 +0,0 @@ -# Don't modify the she-bang line for a cross-build. -# Otherwise it points to our hostpython (which we do not want) -# -# Signed-Off: Michael 'Mickey' Lauer <[email protected]> - -Index: Python-2.6.1/Lib/distutils/command/build_scripts.py -=================================================================== ---- Python-2.6.1.orig/Lib/distutils/command/build_scripts.py -+++ Python-2.6.1/Lib/distutils/command/build_scripts.py -@@ -87,7 +87,7 @@ class build_scripts (Command): - continue - - match = first_line_re.match(first_line) -- if match: -+ if False: #match: - adjust = 1 - post_interp = match.group(1) or '' -
recipes/python/python-native-2.6.4/12-distutils-prefix-is-inside-staging-area.patch deleted +0 -60
60 lines not on this page · raw message
recipes/python/python-native-2.6.4/debug.patch deleted +0 -27
@@ -1,27 +0,0 @@ -Index: Python-2.6.1/Lib/distutils/unixccompiler.py -=================================================================== ---- Python-2.6.1.orig/Lib/distutils/unixccompiler.py 2009-11-13 16:04:54.000000000 +0000 -+++ Python-2.6.1/Lib/distutils/unixccompiler.py 2009-11-13 16:06:27.000000000 +0000 -@@ -300,6 +300,8 @@ - dylib_f = self.library_filename(lib, lib_type='dylib') - static_f = self.library_filename(lib, lib_type='static') - -+ print "Looking in %s for %s" % (lib, dirs) -+ - for dir in dirs: - shared = os.path.join(dir, shared_f) - dylib = os.path.join(dir, dylib_f) -@@ -309,10 +311,13 @@ - # assuming that *all* Unix C compilers do. And of course I'm - # ignoring even GCC's "-static" option. So sue me. - if os.path.exists(dylib): -+ print "Found %s" % (dylib) - return dylib - elif os.path.exists(shared): -+ print "Found %s" % (shared) - return shared - elif os.path.exists(static): -+ print "Found %s" % (static) - return static - - # Oops, didn't find it in *any* of 'dirs'
recipes/python/python-native-2.6.4/nohostlibs.patch deleted +0 -53
53 lines not on this page · raw message
recipes/python/python-native-2.6.4/sitecustomize.py deleted +0 -45
45 lines not on this page · raw message
recipes/python/python-native-2.7.1/00-fix-bindir-libdir-for-cross.patch deleted +0 -20
@@ -1,20 +0,0 @@ -# $(exec_prefix) points to the wrong directory, when installing -# a cross-build. @bindir@ and @libdir@ works better and doesn't -# affect the native build. -# Signed-Off: Michael 'Mickey' Lauer <[email protected]> - -Index: Python-2.6.1/Makefile.pre.in -=================================================================== ---- Python-2.6.1.orig/Makefile.pre.in -+++ Python-2.6.1/Makefile.pre.in -@@ -86,8 +86,8 @@ exec_prefix= @exec_prefix@ - datarootdir= @datarootdir@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include
recipes/python/python-native-2.7.1/01-fix-have-long-long-format.patch deleted +0 -19
@@ -1,19 +0,0 @@ -# The configure script assumes the %lld printf format is not available as it -# can't run its check script. For some reason python refuses to compile without -# this functionality, so we just assume that our printf supports %lld. -# -# Include/pyport.h:243:13: error: #error "This platform's pyconfig.h needs to define PY_FORMAT_LONG_LONG" - -Index: Python-2.7.1/configure.in -=================================================================== ---- Python-2.7.1.orig/configure.in -+++ Python-2.7.1/configure.in -@@ -4151,7 +4151,7 @@ then - ]]])], - [ac_cv_have_long_long_format=yes], - [ac_cv_have_long_long_format=no], -- [ac_cv_have_long_long_format=no]) -+ [ac_cv_have_long_long_format=yes]) - ) - AC_MSG_RESULT($ac_cv_have_long_long_format) - fi
recipes/python/python-native-2.7.1/01-use-proper-tools-for-cross-build.patch deleted +0 -169
169 lines not on this page · raw message
recipes/python/python-native-2.7.1/02-remove-test-for-cross.patch deleted +0 -108
108 lines not on this page · raw message
recipes/python/python-native-2.7.1/03-fix-tkinter-detection.patch deleted +0 -40
@@ -1,40 +0,0 @@ -# We need to supply STAGING_INCDIR here, otherwise the Tk headers -# will not be found. -# Signed-Off: Michael 'Mickey' Lauer <[email protected]> - -Index: Python-2.7.1/setup.py -=================================================================== ---- Python-2.7.1.orig/setup.py 2010-12-26 10:01:38.992621096 -0500 -+++ Python-2.7.1/setup.py 2010-12-26 10:02:31.032604626 -0500 -@@ -1712,7 +1712,7 @@ - dotversion = dotversion[:-1] + '.' + dotversion[-1] - tcl_include_sub = [] - tk_include_sub = [] -- for dir in inc_dirs: -+ for dir in [os.getenv("STAGING_INCDIR")]: - tcl_include_sub += [dir + os.sep + "tcl" + dotversion] - tk_include_sub += [dir + os.sep + "tk" + dotversion] - tk_include_sub += tcl_include_sub -@@ -1731,22 +1731,6 @@ - if dir not in include_dirs: - include_dirs.append(dir) - -- # Check for various platform-specific directories -- if platform == 'sunos5': -- include_dirs.append('/usr/openwin/include') -- added_lib_dirs.append('/usr/openwin/lib') -- elif os.path.exists('/usr/X11R6/include'): -- include_dirs.append('/usr/X11R6/include') -- added_lib_dirs.append('/usr/X11R6/lib64') -- added_lib_dirs.append('/usr/X11R6/lib') -- elif os.path.exists('/usr/X11R5/include'): -- include_dirs.append('/usr/X11R5/include') -- added_lib_dirs.append('/usr/X11R5/lib') -- else: -- # Assume default location for X11 -- include_dirs.append('/usr/X11/include') -- added_lib_dirs.append('/usr/X11/lib') -- - # If Cygwin, then verify that X is installed before proceeding - if platform == 'cygwin': - x11_inc = find_file('X11/Xlib.h', [], include_dirs)
recipes/python/python-native-2.7.1/04-default-is-optimized.patch deleted +0 -18
@@ -1,18 +0,0 @@ -# When compiling for an embedded system, we need every bit of -# performance we can get. default to optimized with the option -# of opt-out. -# Signed-Off: Michael 'Mickey' Lauer <[email protected]> - -Index: Python-2.6.1/Python/compile.c -=================================================================== ---- Python-2.6.1.orig/Python/compile.c -+++ Python-2.6.1/Python/compile.c -@@ -32,7 +32,7 @@ - #include "symtable.h" - #include "opcode.h" - --int Py_OptimizeFlag = 0; -+int Py_OptimizeFlag = 1; - - #define DEFAULT_BLOCK_SIZE 16 - #define DEFAULT_BLOCKS 8
recipes/python/python-native-2.7.1/05-enable-ctypes-cross-build.patch deleted +0 -28
@@ -1,28 +0,0 @@ -# CTypes need to know the actual host we are building on. -# Signed-Off: Michael Dietrich <[email protected]> - -Index: Python-2.7.1/setup.py -=================================================================== ---- Python-2.7.1.orig/setup.py 2010-12-26 10:02:31.032604626 -0500 -+++ Python-2.7.1/setup.py 2010-12-26 10:02:43.182604395 -0500 -@@ -1825,16 +1825,16 @@ - ffi_configfile): - from distutils.dir_util import mkpath - mkpath(ffi_builddir) -- config_args = [] -+ config_args = ['--host=%s' % os.environ["HOST_SYS"], ] - - # Pass empty CFLAGS because we'll just append the resulting - # CFLAGS to Python's; -g or -O2 is to be avoided. -- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \ -- % (ffi_builddir, ffi_srcdir, " ".join(config_args)) -+ cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \ -+ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args)) - - res = os.system(cmd) - if res or not os.path.exists(ffi_configfile): -- print "Failed to configure _ctypes module" -+ print "Failed to configure _ctypes module (res=%d) or missing conffile=%s" % ( res, ffi_configfile ) - return False - - fficonfig = {}
recipes/python/python-native-2.7.1/06-ctypes-libffi-fix-configure.patch deleted +0 -44
44 lines not on this page · raw message
recipes/python/python-native-2.7.1/10-distutils-fix-swig-parameter.patch deleted +0 -16
@@ -1,16 +0,0 @@ -# Some versions of SWIG do not use the extension parameter. -# Make it optional. -# Signed-Off: Michael 'Mickey' Lauer <[email protected]> -Index: Python-2.7.1/Lib/distutils/command/build_ext.py -=================================================================== ---- Python-2.7.1.orig/Lib/distutils/command/build_ext.py 2010-09-10 16:03:17.000000000 -0400 -+++ Python-2.7.1/Lib/distutils/command/build_ext.py 2010-12-26 10:07:28.492632349 -0500 -@@ -531,7 +531,7 @@ - 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
recipes/python/python-native-2.7.1/11-distutils-never-modify-shebang-line.patch deleted +0 -18
@@ -1,18 +0,0 @@ -# Don't modify the she-bang line for a cross-build. -# Otherwise it points to our hostpython (which we do not want) -# -# Signed-Off: Michael 'Mickey' Lauer <[email protected]> - -Index: Python-2.7.1/Lib/distutils/command/build_scripts.py -=================================================================== ---- Python-2.7.1.orig/Lib/distutils/command/build_scripts.py 2010-01-23 04:23:15.000000000 -0500 -+++ Python-2.7.1/Lib/distutils/command/build_scripts.py 2010-12-26 10:07:35.762597668 -0500 -@@ -85,7 +85,7 @@ - continue - - match = first_line_re.match(first_line) -- if match: -+ if False: #match: - adjust = 1 - post_interp = match.group(1) or '' -
recipes/python/python-native-2.7.1/12-distutils-prefix-is-inside-staging-area.patch deleted +0 -60
60 lines not on this page · raw message
recipes/python/python-native-2.7.1/99-ignore-optimization-flag.patch deleted +0 -19
@@ -1,19 +0,0 @@ -# Reinstate the empty -O option to fix weird mixing of native and target -# binaries and libraries with LD_LIBRARY_PATH when host==target -# -# Signed-off-by: Denys Dmytriyenko <[email protected]> - -Index: Python-2.7.1/Modules/main.c -=================================================================== ---- Python-2.7.1.orig/Modules/main.c 2010-06-13 02:50:39.000000000 -0400 -+++ Python-2.7.1/Modules/main.c 2010-12-26 10:09:34.300455892 -0500 -@@ -329,8 +329,7 @@ - - /* case 'J': reserved for Jython */ - -- case 'O': -- Py_OptimizeFlag++; -+ case 'O': /* ignore it */ - break; - - case 'B':
recipes/python/python-native-2.7.1/debug.patch deleted +0 -27
@@ -1,27 +0,0 @@ -Index: Python-2.7.1/Lib/distutils/unixccompiler.py -=================================================================== ---- Python-2.7.1.orig/Lib/distutils/unixccompiler.py 2010-06-27 08:36:16.000000000 -0400 -+++ Python-2.7.1/Lib/distutils/unixccompiler.py 2010-12-26 10:09:44.282632589 -0500 -@@ -318,6 +318,8 @@ - - - -+ print "Looking in %s for %s" % (lib, dirs) -+ - for dir in dirs: - shared = os.path.join(dir, shared_f) - dylib = os.path.join(dir, dylib_f) -@@ -336,10 +338,13 @@ - # assuming that *all* Unix C compilers do. And of course I'm - # ignoring even GCC's "-static" option. So sue me. - if os.path.exists(dylib): -+ print "Found %s" % (dylib) - return dylib - elif os.path.exists(shared): -+ print "Found %s" % (shared) - return shared - elif os.path.exists(static): -+ print "Found %s" % (static) - return static - - # Oops, didn't find it in *any* of 'dirs'
recipes/python/python-native-2.7.1/nohostlibs.patch deleted +0 -29
@@ -1,29 +0,0 @@ -Index: Python-2.7.1/setup.py -=================================================================== ---- Python-2.7.1.orig/setup.py 2010-12-26 10:02:43.000000000 -0500 -+++ Python-2.7.1/setup.py 2010-12-26 10:12:30.920427195 -0500 -@@ -404,11 +404,8 @@ - # lib_dirs and inc_dirs are used to search for files; - # if a file is found in one of those directories, it can - # be assumed that no additional -I,-L directives are needed. -- lib_dirs = self.compiler.library_dirs + [ -- '/lib64', '/usr/lib64', -- '/lib', '/usr/lib', -- ] -- inc_dirs = self.compiler.include_dirs + ['/usr/include'] -+ lib_dirs = self.compiler.library_dirs -+ inc_dirs = self.compiler.include_dirs - exts = [] - missing = [] - -@@ -657,9 +654,7 @@ - pass # Issue 7384: Already linked against curses or tinfo. - elif curses_library: - readline_libs.append(curses_library) -- elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -- 'termcap'): -+ elif self.compiler.find_library_file(lib_dirs, 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'],
recipes/python/python-native-2.7.1/sitecustomize.py deleted +0 -45
45 lines not on this page · raw message
recipes/python/python-native_2.6.1.bb deleted +0 -33
@@ -1,33 +0,0 @@ -require python.inc -DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native" -PR = "${INC_PR}.3" - -SRC_URI = "\ - http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ - file://00-fix-bindir-libdir-for-cross.patch \ - file://04-default-is-optimized.patch \ - file://05-enable-ctypes-cross-build.patch \ - file://10-distutils-fix-swig-parameter.patch \ - file://11-distutils-never-modify-shebang-line.patch \ - file://12-distutils-prefix-is-inside-staging-area.patch \ - file://debug.patch \ - file://nohostlibs.patch \ -" -S = "${WORKDIR}/Python-${PV}" - -inherit native - -EXTRA_OEMAKE = '\ - BUILD_SYS="" \ - HOST_SYS="" \ - LIBC="" \ - STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \ - STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \ -' - -do_install_append() { - install -m 0755 Parser/pgen ${D}${bindir}/pgen -} - -SRC_URI[md5sum] = "e81c2f0953aa60f8062c05a4673f2be0" -SRC_URI[sha256sum] = "cf153f10ba6312a8303ceb01bed834a2786d28aa89c7d73dba64714f691628f6"
recipes/python/python-native_2.6.4.bb deleted +0 -35
@@ -1,35 +0,0 @@ -require python.inc -DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native" -# set to 0 on every increase of INC_PR -PR = "${INC_PR}.1" - -SRC_URI = "\ - http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2;name=archive \ - file://00-fix-bindir-libdir-for-cross.patch \ - file://04-default-is-optimized.patch \ - file://05-enable-ctypes-cross-build.patch \ - file://06-ctypes-libffi-fix-configure.patch \ - file://10-distutils-fix-swig-parameter.patch \ - file://11-distutils-never-modify-shebang-line.patch \ - file://12-distutils-prefix-is-inside-staging-area.patch \ - file://debug.patch \ - file://nohostlibs.patch \ -" -S = "${WORKDIR}/Python-${PV}" - -SRC_URI[archive.md5sum] = "fee5408634a54e721a93531aba37f8c1" -SRC_URI[archive.sha256sum] = "dad8d5575144a210d5cc4fdbc40b8a26386e9cdb1ef58941bec0be02c7cb9d89" - -inherit native - -EXTRA_OEMAKE = '\ - BUILD_SYS="" \ - HOST_SYS="" \ - LIBC="" \ - STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \ - STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \ -' - -do_install_append() { - install -m 0755 Parser/pgen ${D}${bindir}/pgen -}
Signature · 1 line
1.7.4.rc1
Re: [PATCH] python-native: drop old versions 2.6.1 and 2.6.4, remove unneeded python-native-* directories
Quoted 3 lines · Martin Jansa
* python-native-2.7.1 is the same as python-2.7.1 and thanks to FILESPATHPKG .= ':python-:python' it's not needed to keep it twice
Signed-off-by Martin Jansa<[email protected]>
Thanks for doing it.
Quoted 1,509 lines
--- .../00-fix-bindir-libdir-for-cross.patch | 20 --- .../04-default-is-optimized.patch | 18 -- .../10-distutils-fix-swig-parameter.patch | 16 -- .../11-distutils-never-modify-shebang-line.patch | 18 -- ...2-distutils-prefix-is-inside-staging-area.patch | 60 ------- recipes/python/python-native-2.6.1/debug.patch | 27 --- .../python/python-native-2.6.1/nohostlibs.patch | 53 ------ .../python/python-native-2.6.1/sitecustomize.py | 45 ----- .../00-fix-bindir-libdir-for-cross.patch | 20 --- .../04-default-is-optimized.patch | 18 -- .../10-distutils-fix-swig-parameter.patch | 16 -- .../11-distutils-never-modify-shebang-line.patch | 18 -- ...2-distutils-prefix-is-inside-staging-area.patch | 60 ------- recipes/python/python-native-2.6.4/debug.patch | 27 --- .../python/python-native-2.6.4/nohostlibs.patch | 53 ------ .../python/python-native-2.6.4/sitecustomize.py | 45 ----- .../00-fix-bindir-libdir-for-cross.patch | 20 --- .../01-fix-have-long-long-format.patch | 19 --- .../01-use-proper-tools-for-cross-build.patch | 169 -------------------- .../02-remove-test-for-cross.patch | 108 ------------- .../03-fix-tkinter-detection.patch | 40 ----- .../04-default-is-optimized.patch | 18 -- .../05-enable-ctypes-cross-build.patch | 28 ---- .../06-ctypes-libffi-fix-configure.patch | 44 ----- .../10-distutils-fix-swig-parameter.patch | 16 -- .../11-distutils-never-modify-shebang-line.patch | 18 -- ...2-distutils-prefix-is-inside-staging-area.patch | 60 ------- .../99-ignore-optimization-flag.patch | 19 --- recipes/python/python-native-2.7.1/debug.patch | 27 --- .../python/python-native-2.7.1/nohostlibs.patch | 29 ---- .../python/python-native-2.7.1/sitecustomize.py | 45 ----- recipes/python/python-native_2.6.1.bb | 33 ---- recipes/python/python-native_2.6.4.bb | 35 ---- 33 files changed, 0 insertions(+), 1242 deletions(-)delete mode 100644
recipes/python/python-native-2.6.1/00-fix-bindir-libdir-for-cross.patchdelete mode 100644recipes/python/python-native-2.6.1/04-default-is-optimized.patchdelete mode 100644recipes/python/python-native-2.6.1/10-distutils-fix-swig-parameter.patchdelete mode 100644recipes/python/python-native-2.6.1/11-distutils-never-modify-shebang-line.patchdelete mode 100644recipes/python/python-native-2.6.1/12-distutils-prefix-is-inside-staging-area.patchdelete mode 100644recipes/python/python-native-2.6.1/debug.patch
delete mode 100644recipes/python/python-native-2.6.1/nohostlibs.patch
delete mode 100644recipes/python/python-native-2.6.1/sitecustomize.py
delete mode 100644recipes/python/python-native-2.6.4/00-fix-bindir-libdir-for-cross.patchdelete mode 100644recipes/python/python-native-2.6.4/04-default-is-optimized.patchdelete mode 100644recipes/python/python-native-2.6.4/10-distutils-fix-swig-parameter.patchdelete mode 100644recipes/python/python-native-2.6.4/11-distutils-never-modify-shebang-line.patchdelete mode 100644recipes/python/python-native-2.6.4/12-distutils-prefix-is-inside-staging-area.patchdelete mode 100644recipes/python/python-native-2.6.4/debug.patch
delete mode 100644recipes/python/python-native-2.6.4/nohostlibs.patch
delete mode 100644recipes/python/python-native-2.6.4/sitecustomize.py
delete mode 100644recipes/python/python-native-2.7.1/00-fix-bindir-libdir-for-cross.patchdelete mode 100644recipes/python/python-native-2.7.1/01-fix-have-long-long-format.patchdelete mode 100644recipes/python/python-native-2.7.1/01-use-proper-tools-for-cross-build.patchdelete mode 100644recipes/python/python-native-2.7.1/02-remove-test-for-cross.patchdelete mode 100644recipes/python/python-native-2.7.1/03-fix-tkinter-detection.patchdelete mode 100644recipes/python/python-native-2.7.1/04-default-is-optimized.patchdelete mode 100644recipes/python/python-native-2.7.1/05-enable-ctypes-cross-build.patchdelete mode 100644recipes/python/python-native-2.7.1/06-ctypes-libffi-fix-configure.patchdelete mode 100644recipes/python/python-native-2.7.1/10-distutils-fix-swig-parameter.patchdelete mode 100644recipes/python/python-native-2.7.1/11-distutils-never-modify-shebang-line.patchdelete mode 100644recipes/python/python-native-2.7.1/12-distutils-prefix-is-inside-staging-area.patchdelete mode 100644recipes/python/python-native-2.7.1/99-ignore-optimization-flag.patchdelete mode 100644recipes/python/python-native-2.7.1/debug.patch
delete mode 100644recipes/python/python-native-2.7.1/nohostlibs.patch
delete mode 100644recipes/python/python-native-2.7.1/sitecustomize.py
delete mode 100644 recipes/python/python-native_2.6.1.bb
delete mode 100644 recipes/python/python-native_2.6.4.bbrecipes/python/python-native-2.6.1/00-fix-bindir-libdir-for-cross.patch deleted +0
-20@@ -1,20 +0,0 @@ -# $(exec_prefix) points to the wrong directory, when installing -# a cross-build. @bindir@ and @libdir@ works better and doesn't -# affect the native build. -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> - -Index: Python-2.6.1/Makefile.pre.in -=================================================================== ---- Python-2.6.1.orig/Makefile.pre.in -+++ Python-2.6.1/Makefile.pre.in -@@ -86,8 +86,8 @@ exec_prefix= @exec_prefix@ - datarootdir= @datarootdir@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/includerecipes/python/python-native-2.6.1/04-default-is-optimized.patch deleted +0
-18@@ -1,18 +0,0 @@ -# When compiling for an embedded system, we need every bit of -# performance we can get. default to optimized with the option -# of opt-out. -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> - -Index: Python-2.6.1/Python/compile.c -=================================================================== ---- Python-2.6.1.orig/Python/compile.c -+++ Python-2.6.1/Python/compile.c -@@ -32,7 +32,7 @@ - #include "symtable.h" - #include "opcode.h" - --int Py_OptimizeFlag = 0; -+int Py_OptimizeFlag = 1; - - #define DEFAULT_BLOCK_SIZE 16 - #define DEFAULT_BLOCKS 8recipes/python/python-native-2.6.1/10-distutils-fix-swig-parameter.patch deleted +0
-16@@ -1,16 +0,0 @@ -# Some versions of SWIG do not use the extension parameter. -# Make it optional. -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> -Index: Python-2.6.1/Lib/distutils/command/build_ext.py -=================================================================== ---- Python-2.6.1.orig/Lib/distutils/command/build_ext.py -+++ Python-2.6.1/Lib/distutils/command/build_ext.py -@@ -566,7 +566,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, andrecipes/python/python-native-2.6.1/11-distutils-never-modify-shebang-line.patch deleted +0
-18@@ -1,18 +0,0 @@ -# Don't modify the she-bang line for a cross-build. -# Otherwise it points to our hostpython (which we do not want) -# -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> - -Index: Python-2.6.1/Lib/distutils/command/build_scripts.py -=================================================================== ---- Python-2.6.1.orig/Lib/distutils/command/build_scripts.py -+++ Python-2.6.1/Lib/distutils/command/build_scripts.py -@@ -87,7 +87,7 @@ class build_scripts (Command): - continue - - match = first_line_re.match(first_line) -- if match: -+ if False: #match: - adjust = 1 - post_interp = match.group(1) or '' -recipes/python/python-native-2.6.1/12-distutils-prefix-is-inside-staging-area.patch deleted +0
-60@@ -1,60 +0,0 @@ -# The proper prefix is inside our staging area. -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> - -Index: Python-2.6.1/Lib/distutils/sysconfig.py -=================================================================== ---- Python-2.6.1.orig/Lib/distutils/sysconfig.py -+++ Python-2.6.1/Lib/distutils/sysconfig.py -@@ -19,8 +19,8 @@ import sys - from distutils.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") ) - - # Path to the base directory of the project. On Windows the binary may - # live in project/PCBuild9. If we're dealing with an x64 Windows build, -@@ -70,7 +70,10 @@ def get_python_inc(plat_specific=0, pref - sys.exec_prefix -- i.e., ignore 'plat_specific'. - """ - if prefix is None: -- prefix = plat_specific and EXEC_PREFIX or PREFIX -+ if plat_specific: -+ prefix = plat_specific and os.environ['STAGING_INCDIR'].rstrip('include') -+ else: -+ prefix = plat_specific and EXEC_PREFIX or PREFIX - if os.name == "posix": - if python_build: - base = os.path.dirname(os.path.abspath(sys.executable)) -@@ -112,7 +115,10 @@ def get_python_lib(plat_specific=0, stan - sys.exec_prefix -- i.e., ignore 'plat_specific'. - """ - if prefix is None: -- prefix = plat_specific and EXEC_PREFIX or PREFIX -+ if plat_specific: -+ prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip('lib') -+ else: -+ prefix = plat_specific and EXEC_PREFIX or PREFIX - - if os.name == "posix": - libpython = os.path.join(prefix, -@@ -218,7 +218,7 @@ def get_config_h_filename(): - else: - # The name of the config.h file changed in 2.2 - config_h = 'pyconfig.h' -- return os.path.join(inc_dir, config_h) -+ return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def get_makefile_filename(): -@@ -226,7 +226,7 @@ def get_makefile_filename(): - 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") -+ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def parse_config_h(fp, g=None):recipes/python/python-native-2.6.1/debug.patch deleted +0
-27@@ -1,27 +0,0 @@ -Index: Python-2.6.1/Lib/distutils/unixccompiler.py -=================================================================== ---- Python-2.6.1.orig/Lib/distutils/unixccompiler.py 2009-11-13 16:04:54.000000000 +0000 -+++ Python-2.6.1/Lib/distutils/unixccompiler.py 2009-11-13 16:06:27.000000000 +0000 -@@ -300,6 +300,8 @@ - dylib_f = self.library_filename(lib, lib_type='dylib') - static_f = self.library_filename(lib, lib_type='static') - -+ print "Looking in %s for %s" % (lib, dirs) -+ - for dir in dirs: - shared = os.path.join(dir, shared_f) - dylib = os.path.join(dir, dylib_f) -@@ -309,10 +311,13 @@ - # assuming that *all* Unix C compilers do. And of course I'm - # ignoring even GCC's "-static" option. So sue me. - if os.path.exists(dylib): -+ print "Found %s" % (dylib) - return dylib - elif os.path.exists(shared): -+ print "Found %s" % (shared) - return shared - elif os.path.exists(static): -+ print "Found %s" % (static) - return static - - # Oops, didn't find it in *any* of 'dirs'recipes/python/python-native-2.6.1/nohostlibs.patch deleted +0
-53@@ -1,53 +0,0 @@ -Index: Python-2.6.1/setup.py -=================================================================== ---- Python-2.6.1.orig/setup.py 2009-11-13 16:20:47.000000000 +0000 -+++ Python-2.6.1/setup.py 2009-11-13 16:28:00.000000000 +0000 -@@ -310,8 +310,8 @@ - - def detect_modules(self): - # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -+ #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. -@@ -347,10 +347,10 @@ - for directory in reversed(options.dirs): - add_dir_to_list(dir_list, directory) - -- if os.path.normpath(sys.prefix) != '/usr': -- add_dir_to_list(self.compiler.library_dirs, -+ -+ add_dir_to_list(self.compiler.library_dirs, - sysconfig.get_config_var("LIBDIR")) -- add_dir_to_list(self.compiler.include_dirs, -+ add_dir_to_list(self.compiler.include_dirs, - sysconfig.get_config_var("INCLUDEDIR")) - - try: -@@ -361,11 +361,8 @@ - # lib_dirs and inc_dirs are used to search for files; - # if a file is found in one of those directories, it can - # be assumed that no additional -I,-L directives are needed. -- lib_dirs = self.compiler.library_dirs + [ -- '/lib64', '/usr/lib64', -- '/lib', '/usr/lib', -- ] -- inc_dirs = self.compiler.include_dirs + ['/usr/include'] -+ lib_dirs = self.compiler.library_dirs -+ inc_dirs = self.compiler.include_dirs - exts = [] - missing = [] - -@@ -583,8 +580,7 @@ - readline_libs.append('ncurses') - elif self.compiler.find_library_file(lib_dirs, 'curses'): - readline_libs.append('curses') -- elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ elif self.compiler.find_library_file(lib_dirs, - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'],recipes/python/python-native-2.6.1/sitecustomize.py deleted +0
-45@@ -1,45 +0,0 @@ -# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer<[email protected]> -# GPLv2 or later -# Version: 20081123 -# Features: -# * set proper default encoding -# * enable readline completion in the interactive interpreter -# * load command line history on startup -# * save command line history on exit - -import os - -def __exithandler(): - try: - readline.write_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) - except IOError: - pass - -def __registerExitHandler(): - import atexit - atexit.register( __exithandler ) - -def __enableReadlineSupport(): - readline.set_history_length( 1000 ) - readline.parse_and_bind( "tab: complete" ) - try: - readline.read_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) - except IOError: - pass - -def __enableDefaultEncoding(): - import sys - try: - sys.setdefaultencoding( "utf8" ) - except LookupError: - pass - -import sys -try: - import rlcompleter, readline -except ImportError: - pass -else: - __enableDefaultEncoding() - __registerExitHandler() - __enableReadlineSupport()recipes/python/python-native-2.6.4/00-fix-bindir-libdir-for-cross.patch deleted +0
-20@@ -1,20 +0,0 @@ -# $(exec_prefix) points to the wrong directory, when installing -# a cross-build. @bindir@ and @libdir@ works better and doesn't -# affect the native build. -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> - -Index: Python-2.6.1/Makefile.pre.in -=================================================================== ---- Python-2.6.1.orig/Makefile.pre.in -+++ Python-2.6.1/Makefile.pre.in -@@ -86,8 +86,8 @@ exec_prefix= @exec_prefix@ - datarootdir= @datarootdir@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/includerecipes/python/python-native-2.6.4/04-default-is-optimized.patch deleted +0
-18@@ -1,18 +0,0 @@ -# When compiling for an embedded system, we need every bit of -# performance we can get. default to optimized with the option -# of opt-out. -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> - -Index: Python-2.6.1/Python/compile.c -=================================================================== ---- Python-2.6.1.orig/Python/compile.c -+++ Python-2.6.1/Python/compile.c -@@ -32,7 +32,7 @@ - #include "symtable.h" - #include "opcode.h" - --int Py_OptimizeFlag = 0; -+int Py_OptimizeFlag = 1; - - #define DEFAULT_BLOCK_SIZE 16 - #define DEFAULT_BLOCKS 8recipes/python/python-native-2.6.4/10-distutils-fix-swig-parameter.patch deleted +0
-16@@ -1,16 +0,0 @@ -# Some versions of SWIG do not use the extension parameter. -# Make it optional. -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> -Index: Python-2.6.1/Lib/distutils/command/build_ext.py -=================================================================== ---- Python-2.6.1.orig/Lib/distutils/command/build_ext.py -+++ Python-2.6.1/Lib/distutils/command/build_ext.py -@@ -566,7 +566,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, andrecipes/python/python-native-2.6.4/11-distutils-never-modify-shebang-line.patch deleted +0
-18@@ -1,18 +0,0 @@ -# Don't modify the she-bang line for a cross-build. -# Otherwise it points to our hostpython (which we do not want) -# -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> - -Index: Python-2.6.1/Lib/distutils/command/build_scripts.py -=================================================================== ---- Python-2.6.1.orig/Lib/distutils/command/build_scripts.py -+++ Python-2.6.1/Lib/distutils/command/build_scripts.py -@@ -87,7 +87,7 @@ class build_scripts (Command): - continue - - match = first_line_re.match(first_line) -- if match: -+ if False: #match: - adjust = 1 - post_interp = match.group(1) or '' -recipes/python/python-native-2.6.4/12-distutils-prefix-is-inside-staging-area.patch deleted +0
-60@@ -1,60 +0,0 @@ -# The proper prefix is inside our staging area. -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> - -Index: Python-2.6.1/Lib/distutils/sysconfig.py -=================================================================== ---- Python-2.6.1.orig/Lib/distutils/sysconfig.py -+++ Python-2.6.1/Lib/distutils/sysconfig.py -@@ -19,8 +19,8 @@ import sys - from distutils.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") ) - - # Path to the base directory of the project. On Windows the binary may - # live in project/PCBuild9. If we're dealing with an x64 Windows build, -@@ -70,7 +70,10 @@ def get_python_inc(plat_specific=0, pref - sys.exec_prefix -- i.e., ignore 'plat_specific'. - """ - if prefix is None: -- prefix = plat_specific and EXEC_PREFIX or PREFIX -+ if plat_specific: -+ prefix = plat_specific and os.environ['STAGING_INCDIR'].rstrip('include') -+ else: -+ prefix = plat_specific and EXEC_PREFIX or PREFIX - if os.name == "posix": - if python_build: - base = os.path.dirname(os.path.abspath(sys.executable)) -@@ -112,7 +115,10 @@ def get_python_lib(plat_specific=0, stan - sys.exec_prefix -- i.e., ignore 'plat_specific'. - """ - if prefix is None: -- prefix = plat_specific and EXEC_PREFIX or PREFIX -+ if plat_specific: -+ prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip('lib') -+ else: -+ prefix = plat_specific and EXEC_PREFIX or PREFIX - - if os.name == "posix": - libpython = os.path.join(prefix, -@@ -218,7 +218,7 @@ def get_config_h_filename(): - else: - # The name of the config.h file changed in 2.2 - config_h = 'pyconfig.h' -- return os.path.join(inc_dir, config_h) -+ return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def get_makefile_filename(): -@@ -226,7 +226,7 @@ def get_makefile_filename(): - 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") -+ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def parse_config_h(fp, g=None):recipes/python/python-native-2.6.4/debug.patch deleted +0
-27@@ -1,27 +0,0 @@ -Index: Python-2.6.1/Lib/distutils/unixccompiler.py -=================================================================== ---- Python-2.6.1.orig/Lib/distutils/unixccompiler.py 2009-11-13 16:04:54.000000000 +0000 -+++ Python-2.6.1/Lib/distutils/unixccompiler.py 2009-11-13 16:06:27.000000000 +0000 -@@ -300,6 +300,8 @@ - dylib_f = self.library_filename(lib, lib_type='dylib') - static_f = self.library_filename(lib, lib_type='static') - -+ print "Looking in %s for %s" % (lib, dirs) -+ - for dir in dirs: - shared = os.path.join(dir, shared_f) - dylib = os.path.join(dir, dylib_f) -@@ -309,10 +311,13 @@ - # assuming that *all* Unix C compilers do. And of course I'm - # ignoring even GCC's "-static" option. So sue me. - if os.path.exists(dylib): -+ print "Found %s" % (dylib) - return dylib - elif os.path.exists(shared): -+ print "Found %s" % (shared) - return shared - elif os.path.exists(static): -+ print "Found %s" % (static) - return static - - # Oops, didn't find it in *any* of 'dirs'recipes/python/python-native-2.6.4/nohostlibs.patch deleted +0
-53@@ -1,53 +0,0 @@ -Index: Python-2.6.1/setup.py -=================================================================== ---- Python-2.6.1.orig/setup.py 2009-11-13 16:20:47.000000000 +0000 -+++ Python-2.6.1/setup.py 2009-11-13 16:28:00.000000000 +0000 -@@ -310,8 +310,8 @@ - - def detect_modules(self): - # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -+ #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. -@@ -347,10 +347,10 @@ - for directory in reversed(options.dirs): - add_dir_to_list(dir_list, directory) - -- if os.path.normpath(sys.prefix) != '/usr': -- add_dir_to_list(self.compiler.library_dirs, -+ -+ add_dir_to_list(self.compiler.library_dirs, - sysconfig.get_config_var("LIBDIR")) -- add_dir_to_list(self.compiler.include_dirs, -+ add_dir_to_list(self.compiler.include_dirs, - sysconfig.get_config_var("INCLUDEDIR")) - - try: -@@ -361,11 +361,8 @@ - # lib_dirs and inc_dirs are used to search for files; - # if a file is found in one of those directories, it can - # be assumed that no additional -I,-L directives are needed. -- lib_dirs = self.compiler.library_dirs + [ -- '/lib64', '/usr/lib64', -- '/lib', '/usr/lib', -- ] -- inc_dirs = self.compiler.include_dirs + ['/usr/include'] -+ lib_dirs = self.compiler.library_dirs -+ inc_dirs = self.compiler.include_dirs - exts = [] - missing = [] - -@@ -583,8 +580,7 @@ - readline_libs.append('ncurses') - elif self.compiler.find_library_file(lib_dirs, 'curses'): - readline_libs.append('curses') -- elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ elif self.compiler.find_library_file(lib_dirs, - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'],recipes/python/python-native-2.6.4/sitecustomize.py deleted +0
-45@@ -1,45 +0,0 @@ -# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer<[email protected]> -# GPLv2 or later -# Version: 20081123 -# Features: -# * set proper default encoding -# * enable readline completion in the interactive interpreter -# * load command line history on startup -# * save command line history on exit - -import os - -def __exithandler(): - try: - readline.write_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) - except IOError: - pass - -def __registerExitHandler(): - import atexit - atexit.register( __exithandler ) - -def __enableReadlineSupport(): - readline.set_history_length( 1000 ) - readline.parse_and_bind( "tab: complete" ) - try: - readline.read_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) - except IOError: - pass - -def __enableDefaultEncoding(): - import sys - try: - sys.setdefaultencoding( "utf8" ) - except LookupError: - pass - -import sys -try: - import rlcompleter, readline -except ImportError: - pass -else: - __enableDefaultEncoding() - __registerExitHandler() - __enableReadlineSupport()recipes/python/python-native-2.7.1/00-fix-bindir-libdir-for-cross.patch deleted +0
-20@@ -1,20 +0,0 @@ -# $(exec_prefix) points to the wrong directory, when installing -# a cross-build. @bindir@ and @libdir@ works better and doesn't -# affect the native build. -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> - -Index: Python-2.6.1/Makefile.pre.in -=================================================================== ---- Python-2.6.1.orig/Makefile.pre.in -+++ Python-2.6.1/Makefile.pre.in -@@ -86,8 +86,8 @@ exec_prefix= @exec_prefix@ - datarootdir= @datarootdir@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/includerecipes/python/python-native-2.7.1/01-fix-have-long-long-format.patch deleted +0
-19@@ -1,19 +0,0 @@ -# The configure script assumes the %lld printf format is not available as it -# can't run its check script. For some reason python refuses to compile without -# this functionality, so we just assume that our printf supports %lld. -# -# Include/pyport.h:243:13: error: #error "This platform's pyconfig.h needs to define PY_FORMAT_LONG_LONG" - -Index: Python-2.7.1/configure.in -=================================================================== ---- Python-2.7.1.orig/configure.in -+++ Python-2.7.1/configure.in -@@ -4151,7 +4151,7 @@ then - ]]])], - [ac_cv_have_long_long_format=yes], - [ac_cv_have_long_long_format=no], -- [ac_cv_have_long_long_format=no]) -+ [ac_cv_have_long_long_format=yes]) - ) - AC_MSG_RESULT($ac_cv_have_long_long_format) - firecipes/python/python-native-2.7.1/01-use-proper-tools-for-cross-build.patch deleted +0
-169@@ -1,169 +0,0 @@ -# We need to ensure our host tools get run during build, not the freshly -# built cross-tools (this will not work), so we introduce HOSTPYTHON and HOSTPGEN. -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> - -Index: Python-2.7.1/setup.py -=================================================================== ---- Python-2.7.1.orig/setup.py 2010-12-27 13:16:38.032631011 -0500 -+++ Python-2.7.1/setup.py 2010-12-27 13:16:50.130290766 -0500 -@@ -313,6 +313,7 @@ - self.failed.append(ext.name) - self.announce('*** WARNING: renaming "%s" since importing it' - ' failed: %s' % (ext.name, why), level=3) -+ return - assert not self.inplace - basename, tail = os.path.splitext(ext_filename) - newname = basename + "_failed" + tail -@@ -347,8 +348,8 @@ - - def detect_modules(self): - # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -+ # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. -@@ -452,6 +453,9 @@ - - # XXX Omitted modules: gl, pure, dl, SGI-specific modules - -+ lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ] -+ inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ] -+ - # - # The following modules are all pretty straightforward, and compile - # on pretty much any POSIXish platform. -Index: Python-2.7.1/Makefile.pre.in -=================================================================== ---- Python-2.7.1.orig/Makefile.pre.in 2010-12-27 13:16:38.022628181 -0500 -+++ Python-2.7.1/Makefile.pre.in 2010-12-27 13:17:31.870473931 -0500 -@@ -201,6 +201,7 @@ - - ########################################################################## - # Grammar -+GRAMMAR_STAMP= $(srcdir)/grammar-stamp - GRAMMAR_H= $(srcdir)/Include/graminit.h - GRAMMAR_C= $(srcdir)/Python/graminit.c - GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar -@@ -380,7 +381,7 @@ - $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov" - - run_profile_task: -- ./$(BUILDPYTHON) $(PROFILE_TASK) -+ $(HOSTPYTHON) $(PROFILE_TASK) - - build_all_use_profile: - $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use" -@@ -398,14 +399,14 @@ - $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) - - platform: $(BUILDPYTHON) -- $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]'>platform -+ $(RUNSHARED) $(HOSTPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]'>platform - - - # Build the shared modules - sharedmods: $(BUILDPYTHON) - @case $$MAKEFLAGS in \ -- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ -- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ -+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ -+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ - esac - - # Build static library -@@ -535,10 +536,24 @@ - Modules/python.o: $(srcdir)/Modules/python.c - $(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c - -+# GNU "make" interprets rules with two dependents as two copies of the rule. -+# -+# In a parallel build this can lead to pgen being run twice, once for each of -+# GRAMMAR_H and GRAMMAR_C, leading to race conditions in which the compiler -+# reads a partially-overwritten copy of one of these files, leading to syntax -+# errors (or linker errors if the fragment happens to be syntactically valid C) -+# -+# See http://www.gnu.org/software/hello/manual/automake/Multiple-Outputs.html -+# for more information. -+# -+# Introduce ".grammar-stamp" as a contrived single output from PGEN to avoid -+# this: -+$(GRAMMAR_H) $(GRAMMAR_C): $(GRAMMAR_STAMP) - --$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) -+$(GRAMMAR_STAMP): $(PGEN) $(GRAMMAR_INPUT) - -@$(INSTALL) -d Include - -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) -+ touch $(GRAMMAR_STAMP) - - $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) -@@ -921,25 +936,25 @@ - done - $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" -+ $(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" - - # Create the PLATDIR source directory, if one wasn't distributed.. - $(srcdir)/Lib/$(PLATDIR): -@@ -1044,7 +1059,7 @@ - # Install the dynamically loadable modules - # This goes into $(exec_prefix) - sharedinstall: sharedmods -- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ -+ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ -@@ -1117,7 +1132,7 @@ - # This installs a few of the useful scripts in Tools/scripts - scriptsinstall: - SRCDIR=$(srcdir) $(RUNSHARED) \ -- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \ -+ $(HOSTPYTHON) $(srcdir)/Tools/scripts/setup.py install \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --root=/$(DESTDIR) -@@ -1139,7 +1154,7 @@ - - # Run reindent on the library - reindent: -- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib -+ $(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib - - # Rerun configure with the same options as it was run last time, - # provided the config.status script exists -@@ -1242,7 +1257,7 @@ - - # Perform some verification checks on any modified files. - patchcheck: -- $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py -+ $(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py - - # Dependencies -recipes/python/python-native-2.7.1/02-remove-test-for-cross.patch deleted +0
-108@@ -1,108 +0,0 @@ -# OpenEmbedded prepopulates the autotools site cache, so if this -# would be using AC_TRY_CACHE, we could patch it in a more sane way -# Alas, I don't have enough autotalent to do that. -# -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> -Index: Python-2.7.1/configure.in -=================================================================== ---- Python-2.7.1.orig/configure.in 2010-12-26 10:02:03.222663593 -0500 -+++ Python-2.7.1/configure.in 2010-12-26 10:02:19.891414484 -0500 -@@ -2822,49 +2822,6 @@ - AC_CHECK_LIB(resolv, inet_aton) - ) - --# On Tru64, chflags seems to be present, but calling it will --# exit Python --AC_CACHE_CHECK([for chflags], [ac_cv_have_chflags], [dnl --AC_RUN_IFELSE([AC_LANG_SOURCE([[[ --#include<sys/stat.h> --#include<unistd.h> --int main(int argc, char*argv[]) --{ -- if(chflags(argv[0], 0) != 0) -- return 1; -- return 0; --} --]]])], --[ac_cv_have_chflags=yes], --[ac_cv_have_chflags=no], --[ac_cv_have_chflags=cross]) --]) --if test "$ac_cv_have_chflags" = cross ; then -- AC_CHECK_FUNC([chflags], [ac_cv_have_chflags="yes"], [ac_cv_have_chflags="no"]) --fi --if test "$ac_cv_have_chflags" = yes ; then -- AC_DEFINE(HAVE_CHFLAGS, 1, [Define to 1 if you have the `chflags' function.]) --fi -- --AC_CACHE_CHECK([for lchflags], [ac_cv_have_lchflags], [dnl --AC_RUN_IFELSE([AC_LANG_SOURCE([[[ --#include<sys/stat.h> --#include<unistd.h> --int main(int argc, char*argv[]) --{ -- if(lchflags(argv[0], 0) != 0) -- return 1; -- return 0; --} --]]])],[ac_cv_have_lchflags=yes],[ac_cv_have_lchflags=no],[ac_cv_have_lchflags=cross]) --]) --if test "$ac_cv_have_lchflags" = cross ; then -- AC_CHECK_FUNC([lchflags], [ac_cv_have_lchflags="yes"], [ac_cv_have_lchflags="no"]) --fi --if test "$ac_cv_have_lchflags" = yes ; then -- AC_DEFINE(HAVE_LCHFLAGS, 1, [Define to 1 if you have the `lchflags' function.]) --fi -- - dnl Check if system zlib has *Copy() functions - dnl - dnl On MacOSX the linker will search for dylibs on the entire linker path -@@ -4210,48 +4167,6 @@ - LIBS="$LIBS -framework CoreFoundation" - fi - -- --AC_CACHE_CHECK([for %zd printf() format support], ac_cv_have_size_t_format, [dnl --AC_RUN_IFELSE([AC_LANG_SOURCE([[ --#include<stdio.h> --#include<stddef.h> --#include<string.h> -- --#ifdef HAVE_SYS_TYPES_H --#include<sys/types.h> --#endif -- --#ifdef HAVE_SSIZE_T --typedef ssize_t Py_ssize_t; --#elif SIZEOF_VOID_P == SIZEOF_LONG --typedef long Py_ssize_t; --#else --typedef int Py_ssize_t; --#endif -- --int main() --{ -- char buffer[256]; -- -- if(sprintf(buffer, "%zd", (size_t)123)< 0) -- return 1; -- -- if (strcmp(buffer, "123")) -- return 1; -- -- if (sprintf(buffer, "%zd", (Py_ssize_t)-123)< 0) -- return 1; -- -- if (strcmp(buffer, "-123")) -- return 1; -- -- return 0; --} --]])], --[ac_cv_have_size_t_format=yes], --[ac_cv_have_size_t_format=no], --[ac_cv_have_size_t_format="cross -- assuming yes" --])]) - if test "$ac_cv_have_size_t_format" != no ; then - AC_DEFINE(PY_FORMAT_SIZE_T, "z", - [Define to printf format modifier for Py_ssize_t])recipes/python/python-native-2.7.1/03-fix-tkinter-detection.patch deleted +0
-40@@ -1,40 +0,0 @@ -# We need to supply STAGING_INCDIR here, otherwise the Tk headers -# will not be found. -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> - -Index: Python-2.7.1/setup.py -=================================================================== ---- Python-2.7.1.orig/setup.py 2010-12-26 10:01:38.992621096 -0500 -+++ Python-2.7.1/setup.py 2010-12-26 10:02:31.032604626 -0500 -@@ -1712,7 +1712,7 @@ - dotversion = dotversion[:-1] + '.' + dotversion[-1] - tcl_include_sub = [] - tk_include_sub = [] -- for dir in inc_dirs: -+ for dir in [os.getenv("STAGING_INCDIR")]: - tcl_include_sub += [dir + os.sep + "tcl" + dotversion] - tk_include_sub += [dir + os.sep + "tk" + dotversion] - tk_include_sub += tcl_include_sub -@@ -1731,22 +1731,6 @@ - if dir not in include_dirs: - include_dirs.append(dir) - -- # Check for various platform-specific directories -- if platform == 'sunos5': -- include_dirs.append('/usr/openwin/include') -- added_lib_dirs.append('/usr/openwin/lib') -- elif os.path.exists('/usr/X11R6/include'): -- include_dirs.append('/usr/X11R6/include') -- added_lib_dirs.append('/usr/X11R6/lib64') -- added_lib_dirs.append('/usr/X11R6/lib') -- elif os.path.exists('/usr/X11R5/include'): -- include_dirs.append('/usr/X11R5/include') -- added_lib_dirs.append('/usr/X11R5/lib') -- else: -- # Assume default location for X11 -- include_dirs.append('/usr/X11/include') -- added_lib_dirs.append('/usr/X11/lib') -- - # If Cygwin, then verify that X is installed before proceeding - if platform == 'cygwin': - x11_inc = find_file('X11/Xlib.h', [], include_dirs)recipes/python/python-native-2.7.1/04-default-is-optimized.patch deleted +0
-18@@ -1,18 +0,0 @@ -# When compiling for an embedded system, we need every bit of -# performance we can get. default to optimized with the option -# of opt-out. -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> - -Index: Python-2.6.1/Python/compile.c -=================================================================== ---- Python-2.6.1.orig/Python/compile.c -+++ Python-2.6.1/Python/compile.c -@@ -32,7 +32,7 @@ - #include "symtable.h" - #include "opcode.h" - --int Py_OptimizeFlag = 0; -+int Py_OptimizeFlag = 1; - - #define DEFAULT_BLOCK_SIZE 16 - #define DEFAULT_BLOCKS 8recipes/python/python-native-2.7.1/05-enable-ctypes-cross-build.patch deleted +0
-28@@ -1,28 +0,0 @@ -# CTypes need to know the actual host we are building on. -# Signed-Off: Michael Dietrich<[email protected]> - -Index: Python-2.7.1/setup.py -=================================================================== ---- Python-2.7.1.orig/setup.py 2010-12-26 10:02:31.032604626 -0500 -+++ Python-2.7.1/setup.py 2010-12-26 10:02:43.182604395 -0500 -@@ -1825,16 +1825,16 @@ - ffi_configfile): - from distutils.dir_util import mkpath - mkpath(ffi_builddir) -- config_args = [] -+ config_args = ['--host=%s' % os.environ["HOST_SYS"], ] - - # Pass empty CFLAGS because we'll just append the resulting - # CFLAGS to Python's; -g or -O2 is to be avoided. -- cmd = "cd %s&& env CFLAGS='' '%s/configure' %s" \ -- % (ffi_builddir, ffi_srcdir, " ".join(config_args)) -+ cmd = "(cd %s&& autoconf -W cross)&& (cd %s&& env CFLAGS='' '%s/configure' %s)" \ -+ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args)) - - res = os.system(cmd) - if res or not os.path.exists(ffi_configfile): -- print "Failed to configure _ctypes module" -+ print "Failed to configure _ctypes module (res=%d) or missing conffile=%s" % ( res, ffi_configfile ) - return False - - fficonfig = {}recipes/python/python-native-2.7.1/06-ctypes-libffi-fix-configure.patch deleted +0
-44@@ -1,44 +0,0 @@ -This fixes configure issues with recent autoconf, e.g: - autoreconf: Entering directory `Modules/_ctypes/libffi' - autoreconf: configure.ac: not using Gettext - autoreconf: running: aclocal --force - configure.ac:26: error: m4_copy: won't overwrite defined macro: _AC_ARG_VAR_PRECIOUS - configure.ac:26: the top level - -The problem is still present in python-2.6.5 but fixed in python-svn. - -Index: Python-2.7.1/Modules/_ctypes/libffi/Makefile.am -=================================================================== ---- Python-2.7.1.orig/Modules/_ctypes/libffi/Makefile.am 2010-03-19 14:59:20.000000000 -0400 -+++ Python-2.7.1/Modules/_ctypes/libffi/Makefile.am 2010-12-26 10:05:56.112625174 -0500 -@@ -2,7 +2,7 @@ - - AUTOMAKE_OPTIONS = foreign subdir-objects - --SUBDIRS = include testsuite man -+SUBDIRS = include - - EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ - src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \ -@@ -34,8 +34,6 @@ - libtool-version ChangeLog.libffi m4/libtool.m4 \ - m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 - --info_TEXINFOS = doc/libffi.texi -- - ## ################################################################ - - ## -Index: Python-2.7.1/Modules/_ctypes/libffi/configure.ac -=================================================================== ---- Python-2.7.1.orig/Modules/_ctypes/libffi/configure.ac 2010-12-26 10:06:09.752605599 -0500 -+++ Python-2.7.1/Modules/_ctypes/libffi/configure.ac 2010-12-26 10:07:18.260769612 -0500 -@@ -409,7 +409,7 @@ - - AC_CONFIG_LINKS(include/ffitarget.h:src/$TARGETDIR/ffitarget.h) - --AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc) -+AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc Makefile) - - AC_CONFIG_LINKS(include/ffi_common.h:include/ffi_common.h) -recipes/python/python-native-2.7.1/10-distutils-fix-swig-parameter.patch deleted +0
-16@@ -1,16 +0,0 @@ -# Some versions of SWIG do not use the extension parameter. -# Make it optional. -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> -Index: Python-2.7.1/Lib/distutils/command/build_ext.py -=================================================================== ---- Python-2.7.1.orig/Lib/distutils/command/build_ext.py 2010-09-10 16:03:17.000000000 -0400 -+++ Python-2.7.1/Lib/distutils/command/build_ext.py 2010-12-26 10:07:28.492632349 -0500 -@@ -531,7 +531,7 @@ - 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, andrecipes/python/python-native-2.7.1/11-distutils-never-modify-shebang-line.patch deleted +0
-18@@ -1,18 +0,0 @@ -# Don't modify the she-bang line for a cross-build. -# Otherwise it points to our hostpython (which we do not want) -# -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> - -Index: Python-2.7.1/Lib/distutils/command/build_scripts.py -=================================================================== ---- Python-2.7.1.orig/Lib/distutils/command/build_scripts.py 2010-01-23 04:23:15.000000000 -0500 -+++ Python-2.7.1/Lib/distutils/command/build_scripts.py 2010-12-26 10:07:35.762597668 -0500 -@@ -85,7 +85,7 @@ - continue - - match = first_line_re.match(first_line) -- if match: -+ if False: #match: - adjust = 1 - post_interp = match.group(1) or '' -recipes/python/python-native-2.7.1/12-distutils-prefix-is-inside-staging-area.patch deleted +0
-60@@ -1,60 +0,0 @@ -# The proper prefix is inside our staging area. -# Signed-Off: Michael 'Mickey' Lauer<[email protected]> - -Index: Python-2.7.1/Lib/distutils/sysconfig.py -=================================================================== ---- Python-2.7.1.orig/Lib/distutils/sysconfig.py 2010-11-06 10:16:30.000000000 -0400 -+++ Python-2.7.1/Lib/distutils/sysconfig.py 2010-12-26 10:08:40.760410838 -0500 -@@ -19,8 +19,8 @@ - from distutils.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") ) - - # Path to the base directory of the project. On Windows the binary may - # live in project/PCBuild9. If we're dealing with an x64 Windows build, -@@ -70,7 +70,10 @@ - sys.exec_prefix -- i.e., ignore 'plat_specific'. - """ - if prefix is None: -- prefix = plat_specific and EXEC_PREFIX or PREFIX -+ if plat_specific: -+ prefix = plat_specific and os.environ['STAGING_INCDIR'].rstrip('include') -+ else: -+ prefix = plat_specific and EXEC_PREFIX or PREFIX - - if os.name == "posix": - if python_build: -@@ -111,7 +114,10 @@ - sys.exec_prefix -- i.e., ignore 'plat_specific'. - """ - if prefix is None: -- prefix = plat_specific and EXEC_PREFIX or PREFIX -+ if plat_specific: -+ prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip('lib') -+ else: -+ prefix = plat_specific and EXEC_PREFIX or PREFIX - - if os.name == "posix": - libpython = os.path.join(prefix, -@@ -199,7 +205,7 @@ - else: - # The name of the config.h file changed in 2.2 - config_h = 'pyconfig.h' -- return os.path.join(inc_dir, config_h) -+ return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def get_makefile_filename(): -@@ -207,7 +213,7 @@ - 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") -+ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def parse_config_h(fp, g=None):recipes/python/python-native-2.7.1/99-ignore-optimization-flag.patch deleted +0
-19@@ -1,19 +0,0 @@ -# Reinstate the empty -O option to fix weird mixing of native and target -# binaries and libraries with LD_LIBRARY_PATH when host==target -# -# Signed-off-by: Denys Dmytriyenko<[email protected]> - -Index: Python-2.7.1/Modules/main.c -=================================================================== ---- Python-2.7.1.orig/Modules/main.c 2010-06-13 02:50:39.000000000 -0400 -+++ Python-2.7.1/Modules/main.c 2010-12-26 10:09:34.300455892 -0500 -@@ -329,8 +329,7 @@ - - /* case 'J': reserved for Jython */ - -- case 'O': -- Py_OptimizeFlag++; -+ case 'O': /* ignore it */ - break; - - case 'B':recipes/python/python-native-2.7.1/debug.patch deleted +0
-27@@ -1,27 +0,0 @@ -Index: Python-2.7.1/Lib/distutils/unixccompiler.py -=================================================================== ---- Python-2.7.1.orig/Lib/distutils/unixccompiler.py 2010-06-27 08:36:16.000000000 -0400 -+++ Python-2.7.1/Lib/distutils/unixccompiler.py 2010-12-26 10:09:44.282632589 -0500 -@@ -318,6 +318,8 @@ - - - -+ print "Looking in %s for %s" % (lib, dirs) -+ - for dir in dirs: - shared = os.path.join(dir, shared_f) - dylib = os.path.join(dir, dylib_f) -@@ -336,10 +338,13 @@ - # assuming that *all* Unix C compilers do. And of course I'm - # ignoring even GCC's "-static" option. So sue me. - if os.path.exists(dylib): -+ print "Found %s" % (dylib) - return dylib - elif os.path.exists(shared): -+ print "Found %s" % (shared) - return shared - elif os.path.exists(static): -+ print "Found %s" % (static) - return static - - # Oops, didn't find it in *any* of 'dirs'recipes/python/python-native-2.7.1/nohostlibs.patch deleted +0
-29@@ -1,29 +0,0 @@ -Index: Python-2.7.1/setup.py -=================================================================== ---- Python-2.7.1.orig/setup.py 2010-12-26 10:02:43.000000000 -0500 -+++ Python-2.7.1/setup.py 2010-12-26 10:12:30.920427195 -0500 -@@ -404,11 +404,8 @@ - # lib_dirs and inc_dirs are used to search for files; - # if a file is found in one of those directories, it can - # be assumed that no additional -I,-L directives are needed. -- lib_dirs = self.compiler.library_dirs + [ -- '/lib64', '/usr/lib64', -- '/lib', '/usr/lib', -- ] -- inc_dirs = self.compiler.include_dirs + ['/usr/include'] -+ lib_dirs = self.compiler.library_dirs -+ inc_dirs = self.compiler.include_dirs - exts = [] - missing = [] - -@@ -657,9 +654,7 @@ - pass # Issue 7384: Already linked against curses or tinfo. - elif curses_library: - readline_libs.append(curses_library) -- elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -- 'termcap'): -+ elif self.compiler.find_library_file(lib_dirs, 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'],recipes/python/python-native-2.7.1/sitecustomize.py deleted +0
-45@@ -1,45 +0,0 @@ -# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer<[email protected]> -# GPLv2 or later -# Version: 20081123 -# Features: -# * set proper default encoding -# * enable readline completion in the interactive interpreter -# * load command line history on startup -# * save command line history on exit - -import os - -def __exithandler(): - try: - readline.write_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) - except IOError: - pass - -def __registerExitHandler(): - import atexit - atexit.register( __exithandler ) - -def __enableReadlineSupport(): - readline.set_history_length( 1000 ) - readline.parse_and_bind( "tab: complete" ) - try: - readline.read_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) - except IOError: - pass - -def __enableDefaultEncoding(): - import sys - try: - sys.setdefaultencoding( "utf8" ) - except LookupError: - pass - -import sys -try: - import rlcompleter, readline -except ImportError: - pass -else: - __enableDefaultEncoding() - __registerExitHandler() - __enableReadlineSupport()recipes/python/python-native_2.6.1.bb deleted +0
-33@@ -1,33 +0,0 @@ -require python.inc -DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native" -PR = "${INC_PR}.3" - -SRC_URI = "\ - http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ - file://00-fix-bindir-libdir-for-cross.patch \ - file://04-default-is-optimized.patch \ - file://05-enable-ctypes-cross-build.patch \ - file://10-distutils-fix-swig-parameter.patch \ - file://11-distutils-never-modify-shebang-line.patch \ - file://12-distutils-prefix-is-inside-staging-area.patch \ - file://debug.patch \ - file://nohostlibs.patch \ -" -S = "${WORKDIR}/Python-${PV}" - -inherit native - -EXTRA_OEMAKE = '\ - BUILD_SYS="" \ - HOST_SYS="" \ - LIBC="" \ - STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \ - STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \ -' - -do_install_append() { - install -m 0755 Parser/pgen ${D}${bindir}/pgen -} - -SRC_URI[md5sum] = "e81c2f0953aa60f8062c05a4673f2be0" -SRC_URI[sha256sum] = "cf153f10ba6312a8303ceb01bed834a2786d28aa89c7d73dba64714f691628f6"recipes/python/python-native_2.6.4.bb deleted +0
-35@@ -1,35 +0,0 @@ -require python.inc -DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native" -# set to 0 on every increase of INC_PR -PR = "${INC_PR}.1" - -SRC_URI = "\ - http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2;name=archive \ - file://00-fix-bindir-libdir-for-cross.patch \ - file://04-default-is-optimized.patch \ - file://05-enable-ctypes-cross-build.patch \ - file://06-ctypes-libffi-fix-configure.patch \ - file://10-distutils-fix-swig-parameter.patch \ - file://11-distutils-never-modify-shebang-line.patch \ - file://12-distutils-prefix-is-inside-staging-area.patch \ - file://debug.patch \ - file://nohostlibs.patch \ -" -S = "${WORKDIR}/Python-${PV}" - -SRC_URI[archive.md5sum] = "fee5408634a54e721a93531aba37f8c1" -SRC_URI[archive.sha256sum] = "dad8d5575144a210d5cc4fdbc40b8a26386e9cdb1ef58941bec0be02c7cb9d89" - -inherit native - -EXTRA_OEMAKE = '\ - BUILD_SYS="" \ - HOST_SYS="" \ - LIBC="" \ - STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \ - STAGING_INCDIR=${STAGING_INCDIR_NATIVE} \ -' - -do_install_append() { - install -m 0755 Parser/pgen ${D}${bindir}/pgen -}