From 27f3b8da5da091243683e63a1506438577184d0e Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 3 Apr 2008 05:18:43 +0000 Subject: python: upgraded to 2.5.2 (merged from OE) git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4163 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../packages/python/python-2.5-manifest.inc | 148 +++++++++++---------- .../packages/python/python-2.5.1/autohell.patch | 49 ------- .../python/python-2.5.1/bindir-libdir.patch | 20 --- .../python/python-2.5.1/crosscompile.patch | 110 --------------- .../python/python-2.5.1/default-is-optimized.patch | 13 -- .../python-2.5.1/fix-tkinter-detection.patch | 41 ------ .../python/python-2.5.1/sitebranding.patch | 21 --- .../packages/python/python-2.5.2/autohell.patch | 50 +++++++ .../python/python-2.5.2/bindir-libdir.patch | 20 +++ .../python/python-2.5.2/crosscompile.patch | 110 +++++++++++++++ .../python/python-2.5.2/default-is-optimized.patch | 13 ++ .../python/python-2.5.2/enable-ctypes-module.patch | 106 +++++++++++++++ .../python-2.5.2/fix-tkinter-detection.patch | 41 ++++++ .../python/python-2.5.2/sitebranding.patch | 21 +++ .../packages/python/python-2.5.2/sitecustomize.py | 44 ++++++ .../python/python-native-2.5.1/bindir-libdir.patch | 18 --- .../python-native-2.5.1/cross-distutils.patch | 36 ----- .../python-native-2.5.1/default-is-optimized.patch | 13 -- .../dont-modify-shebang-line.patch | 16 --- .../python/python-native-2.5.2/bindir-libdir.patch | 18 +++ .../python-native-2.5.2/cross-distutils.patch | 36 +++++ .../python-native-2.5.2/default-is-optimized.patch | 13 ++ .../dont-modify-shebang-line.patch | 16 +++ meta-extras/packages/python/python_2.5.1.bb | 96 ------------- meta-extras/packages/python/python_2.5.2.bb | 105 +++++++++++++++ 25 files changed, 672 insertions(+), 502 deletions(-) delete mode 100644 meta-extras/packages/python/python-2.5.1/autohell.patch delete mode 100644 meta-extras/packages/python/python-2.5.1/bindir-libdir.patch delete mode 100644 meta-extras/packages/python/python-2.5.1/crosscompile.patch delete mode 100644 meta-extras/packages/python/python-2.5.1/default-is-optimized.patch delete mode 100644 meta-extras/packages/python/python-2.5.1/fix-tkinter-detection.patch delete mode 100644 meta-extras/packages/python/python-2.5.1/sitebranding.patch create mode 100644 meta-extras/packages/python/python-2.5.2/autohell.patch create mode 100644 meta-extras/packages/python/python-2.5.2/bindir-libdir.patch create mode 100644 meta-extras/packages/python/python-2.5.2/crosscompile.patch create mode 100644 meta-extras/packages/python/python-2.5.2/default-is-optimized.patch create mode 100644 meta-extras/packages/python/python-2.5.2/enable-ctypes-module.patch create mode 100644 meta-extras/packages/python/python-2.5.2/fix-tkinter-detection.patch create mode 100644 meta-extras/packages/python/python-2.5.2/sitebranding.patch create mode 100644 meta-extras/packages/python/python-2.5.2/sitecustomize.py delete mode 100644 meta-extras/packages/python/python-native-2.5.1/bindir-libdir.patch delete mode 100644 meta-extras/packages/python/python-native-2.5.1/cross-distutils.patch delete mode 100644 meta-extras/packages/python/python-native-2.5.1/default-is-optimized.patch delete mode 100644 meta-extras/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch create mode 100644 meta-extras/packages/python/python-native-2.5.2/bindir-libdir.patch create mode 100644 meta-extras/packages/python/python-native-2.5.2/cross-distutils.patch create mode 100644 meta-extras/packages/python/python-native-2.5.2/default-is-optimized.patch create mode 100644 meta-extras/packages/python/python-native-2.5.2/dont-modify-shebang-line.patch delete mode 100644 meta-extras/packages/python/python_2.5.1.bb create mode 100644 meta-extras/packages/python/python_2.5.2.bb (limited to 'meta-extras') diff --git a/meta-extras/packages/python/python-2.5-manifest.inc b/meta-extras/packages/python/python-2.5-manifest.inc index e80da80d8..c098494d1 100644 --- a/meta-extras/packages/python/python-2.5-manifest.inc +++ b/meta-extras/packages/python/python-2.5-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by 'contrib/python/generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer ] on Thu Aug 23 10:20:20 2007 +### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer ] on Fri Mar 21 18:43:05 2008 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -8,287 +8,297 @@ ######################################################################################################################## -PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " +PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " -PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " +PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " DESCRIPTION_python-profile="Python Basic Profiling Support" -PR_python-profile="ml1" +PR_python-profile="ml0" RDEPENDS_python-profile="python-core" FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* " DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml1" +PR_python-threading="ml0" RDEPENDS_python-threading="python-core python-lang" FILES_python-threading="${libdir}/python2.5/_threading_local.* ${libdir}/python2.5/dummy_thread.* ${libdir}/python2.5/dummy_threading.* ${libdir}/python2.5/mutex.* ${libdir}/python2.5/threading.* ${libdir}/python2.5/Queue.* " DESCRIPTION_python-distutils="Python Distribution Utilities" -PR_python-distutils="ml1" +PR_python-distutils="ml0" RDEPENDS_python-distutils="python-core" FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils " DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" -PR_python-textutils="ml1" +PR_python-textutils="ml0" RDEPENDS_python-textutils="python-core python-io python-re python-stringold" FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* " DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" -PR_python-codecs="ml1" -RDEPENDS_python-codecs="python-core" +PR_python-codecs="ml0" +RDEPENDS_python-codecs="python-core python-lang" FILES_python-codecs="${libdir}/python2.5/codecs.* ${libdir}/python2.5/encodings ${libdir}/python2.5/gettext.* ${libdir}/python2.5/locale.* ${libdir}/python2.5/lib-dynload/_locale.so ${libdir}/python2.5/lib-dynload/unicodedata.so ${libdir}/python2.5/stringprep.* ${libdir}/python2.5/xdrlib.* " +DESCRIPTION_python-ctypes="Python C Types Support" +PR_python-ctypes="ml0" +RDEPENDS_python-ctypes="python-core" +FILES_python-ctypes="${libdir}/python2.5/ctypes ${libdir}/python2.5/lib-dynload/_ctypes.so " + DESCRIPTION_python-pickle="Python Persistence Support" -PR_python-pickle="ml1" +PR_python-pickle="ml0" RDEPENDS_python-pickle="python-core python-codecs python-io python-re" FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so " DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml1" +PR_python-datetime="ml0" RDEPENDS_python-datetime="python-core python-codecs" FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so " DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" -PR_python-core="ml3" +PR_python-core="ml0" RDEPENDS_python-core="" -FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* " +FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/struct.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/_struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* " DESCRIPTION_python-io="Python Low-Level I/O" -PR_python-io="ml1" +PR_python-io="ml0" RDEPENDS_python-io="python-core python-math" FILES_python-io="${libdir}/python2.5/lib-dynload/_socket.so ${libdir}/python2.5/lib-dynload/_ssl.so ${libdir}/python2.5/lib-dynload/select.so ${libdir}/python2.5/lib-dynload/termios.so ${libdir}/python2.5/lib-dynload/cStringIO.so ${libdir}/python2.5/pipes.* ${libdir}/python2.5/socket.* ${libdir}/python2.5/tempfile.* ${libdir}/python2.5/StringIO.* " DESCRIPTION_python-compiler="Python Compiler Support" -PR_python-compiler="ml1" +PR_python-compiler="ml0" RDEPENDS_python-compiler="python-core" FILES_python-compiler="${libdir}/python2.5/compiler " DESCRIPTION_python-compression="Python High Level Compression Support" -PR_python-compression="ml1" +PR_python-compression="ml0" RDEPENDS_python-compression="python-core python-zlib" FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* " DESCRIPTION_python-re="Python Regular Expression APIs" -PR_python-re="ml1" +PR_python-re="ml0" RDEPENDS_python-re="python-core" FILES_python-re="${libdir}/python2.5/re.* ${libdir}/python2.5/sre.* ${libdir}/python2.5/sre_compile.* ${libdir}/python2.5/sre_constants* ${libdir}/python2.5/sre_parse.* " DESCRIPTION_python-xmlrpc="Python XMLRPC Support" -PR_python-xmlrpc="ml1" +PR_python-xmlrpc="ml0" RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* " DESCRIPTION_python-terminal="Python Terminal Controlling Support" -PR_python-terminal="ml1" +PR_python-terminal="ml0" RDEPENDS_python-terminal="python-core python-io" FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* " DESCRIPTION_python-email="Python Email Support" -PR_python-email="ml1" +PR_python-email="ml0" RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image" FILES_python-email="${libdir}/python2.5/email " DESCRIPTION_python-image="Python Graphical Image Handling" -PR_python-image="ml1" +PR_python-image="ml0" RDEPENDS_python-image="python-core" FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so " +DESCRIPTION_python-tests="Python Tests" +PR_python-tests="ml0" +RDEPENDS_python-tests="python-core" +FILES_python-tests="${libdir}/python2.5/test " + DESCRIPTION_python-core-dbg="Python core module debug information" -PR_python-core-dbg="ml1" +PR_python-core-dbg="ml0" RDEPENDS_python-core-dbg="python-core" FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug " DESCRIPTION_python-resource="Python Resource Control Interface" -PR_python-resource="ml1" +PR_python-resource="ml0" RDEPENDS_python-resource="python-core" FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so " DESCRIPTION_python-devel="Python Development Package" -PR_python-devel="ml1" +PR_python-devel="ml0" RDEPENDS_python-devel="python-core" FILES_python-devel="${includedir} ${libdir}/python2.5/config " DESCRIPTION_python-math="Python Math Support" -PR_python-math="ml1" +PR_python-math="ml0" RDEPENDS_python-math="python-core" FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* " DESCRIPTION_python-hotshot="Python Hotshot Profiler" -PR_python-hotshot="ml1" +PR_python-hotshot="ml0" RDEPENDS_python-hotshot="python-core" FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so " DESCRIPTION_python-unixadmin="Python Unix Administration Support" -PR_python-unixadmin="ml1" +PR_python-unixadmin="ml0" RDEPENDS_python-unixadmin="python-core" FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* " -DESCRIPTION_python-syslog="Python's syslog Interface" -PR_python-syslog="ml1" +DESCRIPTION_python-syslog="Python's Syslog Interface" +PR_python-syslog="ml0" RDEPENDS_python-syslog="python-core" FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so " DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" -PR_python-tkinter="ml1" +PR_python-tkinter="ml0" RDEPENDS_python-tkinter="python-core" FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk " DESCRIPTION_python-gdbm="Python GNU Database Support" -PR_python-gdbm="ml1" +PR_python-gdbm="ml0" RDEPENDS_python-gdbm="python-core" FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so " DESCRIPTION_python-fcntl="Python's fcntl Interface" -PR_python-fcntl="ml1" +PR_python-fcntl="ml0" RDEPENDS_python-fcntl="python-core" FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so " DESCRIPTION_python-netclient="Python Internet Protocol Clients" -PR_python-netclient="ml2" -RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime python-stringold" +PR_python-netclient="ml0" +RDEPENDS_python-netclient="python-core python-crypt python-datetime python-io python-lang python-logging python-mime" FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* " DESCRIPTION_python-pprint="Python Pretty-Print Support" -PR_python-pprint="ml1" +PR_python-pprint="ml0" RDEPENDS_python-pprint="python-core" FILES_python-pprint="${libdir}/python2.5/pprint.* " DESCRIPTION_python-netserver="Python Internet Protocol Servers" -PR_python-netserver="ml1" +PR_python-netserver="ml0" RDEPENDS_python-netserver="python-core python-netclient" FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* " DESCRIPTION_python-curses="Python Curses Support" -PR_python-curses="ml1" +PR_python-curses="ml0" RDEPENDS_python-curses="python-core" FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so " DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon" -PR_python-smtpd="ml1" +PR_python-smtpd="ml0" RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime" FILES_python-smtpd="${bindir}/smtpd.* " DESCRIPTION_python-html="Python HTML Processing" -PR_python-html="ml1" +PR_python-html="ml0" RDEPENDS_python-html="python-core" FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* " DESCRIPTION_python-readline="Python Readline Support" -PR_python-readline="ml1" +PR_python-readline="ml0" RDEPENDS_python-readline="python-core" FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* " DESCRIPTION_python-subprocess="Python Subprocess Support" -PR_python-subprocess="ml1" +PR_python-subprocess="ml0" RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle" FILES_python-subprocess="${libdir}/python2.5/subprocess.* " DESCRIPTION_python-pydoc="Python Interactive Help Support" -PR_python-pydoc="ml1" +PR_python-pydoc="ml0" RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* " DESCRIPTION_python-logging="Python Logging Support" -PR_python-logging="ml1" -RDEPENDS_python-logging="python-core" +PR_python-logging="ml0" +RDEPENDS_python-logging="python-core python-io python-lang python-stringold" FILES_python-logging="${libdir}/python2.5/logging " DESCRIPTION_python-mailbox="Python Mailbox Format Support" -PR_python-mailbox="ml1" +PR_python-mailbox="ml0" RDEPENDS_python-mailbox="python-core python-mime" FILES_python-mailbox="${libdir}/python2.5/mailbox.* " DESCRIPTION_python-xml="Python basic XML support." -PR_python-xml="ml2" +PR_python-xml="ml0" RDEPENDS_python-xml="python-core python-re python-netclient" FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* " DESCRIPTION_python-mime="Python MIME Handling APIs" -PR_python-mime="ml1" +PR_python-mime="ml0" RDEPENDS_python-mime="python-core python-io" FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* " DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support" -PR_python-sqlite3="ml1" -RDEPENDS_python-sqlite3="python-core" -FILES_python-sqlite3="${libdir}/python2.5/sqlite3 " +PR_python-sqlite3="ml2" +RDEPENDS_python-sqlite3="python-core python-datetime python-lang python-crypt python-io python-threading python-zlib" +FILES_python-sqlite3="${libdir}/python2.5/lib-dynload/_sqlite3.so ${libdir}/python2.5/sqlite3/dbapi2.* ${libdir}/python2.5/sqlite3/__init__.* " -DESCRIPTION_python-tests="Python Tests" -PR_python-tests="ml1" -RDEPENDS_python-tests="python-core" -FILES_python-tests="${libdir}/python2.5/test " +DESCRIPTION_python-sqlite3-tests="Python Sqlite3 Database Support Tests" +PR_python-sqlite3-tests="ml0" +RDEPENDS_python-sqlite3-tests="python-core python-sqlite3" +FILES_python-sqlite3-tests="${libdir}/python2.5/sqlite3/test " DESCRIPTION_python-unittest="Python Unit Testing Framework" -PR_python-unittest="ml1" +PR_python-unittest="ml0" RDEPENDS_python-unittest="python-core python-stringold python-lang" FILES_python-unittest="${libdir}/python2.5/unittest.* " DESCRIPTION_python-stringold="Python String APIs [deprecated]" -PR_python-stringold="ml1" +PR_python-stringold="ml0" RDEPENDS_python-stringold="python-core python-re" FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* " DESCRIPTION_python-robotparser="Python robots.txt parser" -PR_python-robotparser="ml1" +PR_python-robotparser="ml0" RDEPENDS_python-robotparser="python-core python-netclient" FILES_python-robotparser="${libdir}/python2.5/robotparser.* " DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" -PR_python-lib-old-and-deprecated="ml1" +PR_python-lib-old-and-deprecated="ml0" RDEPENDS_python-lib-old-and-deprecated="python-core" FILES_python-lib-old-and-deprecated="${libdir}/python2.5/lib-old " DESCRIPTION_python-compile="Python Bytecode Compilation Support" -PR_python-compile="ml1" +PR_python-compile="ml0" RDEPENDS_python-compile="python-core" FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* " DESCRIPTION_python-debugger="Python Debugger" -PR_python-debugger="ml1" +PR_python-debugger="ml0" RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell" FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml1" +PR_python-shell="ml0" RDEPENDS_python-shell="python-core python-re" FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* " DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" -PR_python-bsddb="ml1" +PR_python-bsddb="ml0" RDEPENDS_python-bsddb="python-core" FILES_python-bsddb="${libdir}/python2.5/bsddb " DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" -PR_python-mmap="ml1" +PR_python-mmap="ml0" RDEPENDS_python-mmap="python-core python-io" FILES_python-mmap="${libdir}/python2.5/lib-dynload/mmap.so " DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml1" +PR_python-zlib="ml0" RDEPENDS_python-zlib="python-core" FILES_python-zlib="${libdir}/python2.5/lib-dynload/zlib.so " DESCRIPTION_python-db="Python File-Based Database Support" -PR_python-db="ml1" +PR_python-db="ml0" RDEPENDS_python-db="python-core" FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* " DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" PR_python-crypt="ml1" RDEPENDS_python-crypt="python-core" -FILES_python-crypt="${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/md5.so ${libdir}/python2.5/lib-dynload/rotor.so ${libdir}/python2.5/lib-dynload/sha.so " +FILES_python-crypt="${libdir}/python2.5/hashlib.* ${libdir}/python2.5/md5.* ${libdir}/python2.5/sha.* ${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/_hashlib.so ${libdir}/python2.5/lib-dynload/_sha256.so ${libdir}/python2.5/lib-dynload/_sha512.so " DESCRIPTION_python-idle="Python Integrated Development Environment" -PR_python-idle="ml1" +PR_python-idle="ml0" RDEPENDS_python-idle="python-core python-tkinter" FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib " DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml1" +PR_python-lang="ml0" RDEPENDS_python-lang="python-core" FILES_python-lang="${libdir}/python2.5/lib-dynload/array.so ${libdir}/python2.5/lib-dynload/parser.so ${libdir}/python2.5/lib-dynload/operator.so ${libdir}/python2.5/lib-dynload/_weakref.so ${libdir}/python2.5/lib-dynload/itertools.so ${libdir}/python2.5/lib-dynload/collections.so ${libdir}/python2.5/lib-dynload/_bisect.so ${libdir}/python2.5/lib-dynload/_heapq.so ${libdir}/python2.5/atexit.* ${libdir}/python2.5/bisect.* ${libdir}/python2.5/code.* ${libdir}/python2.5/codeop.* ${libdir}/python2.5/dis.* ${libdir}/python2.5/heapq.* ${libdir}/python2.5/inspect.* ${libdir}/python2.5/keyword.* ${libdir}/python2.5/opcode.* ${libdir}/python2.5/repr.* ${libdir}/python2.5/token.* ${libdir}/python2.5/tokenize.* ${libdir}/python2.5/traceback.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/weakref.* " DESCRIPTION_python-audio="Python Audio Handling" -PR_python-audio="ml1" +PR_python-audio="ml0" RDEPENDS_python-audio="python-core" FILES_python-audio="${libdir}/python2.5/wave.* ${libdir}/python2.5/chunk.* ${libdir}/python2.5/sndhdr.* ${libdir}/python2.5/lib-dynload/ossaudiodev.so ${libdir}/python2.5/lib-dynload/audioop.so " diff --git a/meta-extras/packages/python/python-2.5.1/autohell.patch b/meta-extras/packages/python/python-2.5.1/autohell.patch deleted file mode 100644 index e2d63145b..000000000 --- a/meta-extras/packages/python/python-2.5.1/autohell.patch +++ /dev/null @@ -1,49 +0,0 @@ -# -# FIXME: Don't simply rip this test out... add getting it from cache -# -Index: Python-2.5.1/configure.in -=================================================================== ---- Python-2.5.1.orig/configure.in -+++ Python-2.5.1/configure.in -@@ -3367,41 +3367,6 @@ else - AC_MSG_RESULT(no) - fi - --AC_MSG_CHECKING(for %zd printf() format support) --AC_TRY_RUN([#include --#include --#include -- --int main() --{ -- char buffer[256]; -- --#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 -- -- 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_MSG_RESULT(yes) -- AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])], -- AC_MSG_RESULT(no)) -- - AC_CHECK_TYPE(socklen_t,, - AC_DEFINE(socklen_t,int, - Define to `int' if does not define.),[ diff --git a/meta-extras/packages/python/python-2.5.1/bindir-libdir.patch b/meta-extras/packages/python/python-2.5.1/bindir-libdir.patch deleted file mode 100644 index 047c358a5..000000000 --- a/meta-extras/packages/python/python-2.5.1/bindir-libdir.patch +++ /dev/null @@ -1,20 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: Python-2.5.1/Makefile.pre.in -=================================================================== ---- Python-2.5.1.orig/Makefile.pre.in -+++ Python-2.5.1/Makefile.pre.in -@@ -83,8 +83,8 @@ prefix= @prefix@ - exec_prefix= @exec_prefix@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include diff --git a/meta-extras/packages/python/python-2.5.1/crosscompile.patch b/meta-extras/packages/python/python-2.5.1/crosscompile.patch deleted file mode 100644 index f456048ef..000000000 --- a/meta-extras/packages/python/python-2.5.1/crosscompile.patch +++ /dev/null @@ -1,110 +0,0 @@ -# -# Patch (C) by Michael 'Mickey' Lauer -# -Index: Python-2.5.1/Makefile.pre.in -=================================================================== ---- Python-2.5.1.orig/Makefile.pre.in -+++ Python-2.5.1/Makefile.pre.in -@@ -170,6 +170,7 @@ UNICODE_OBJS= @UNICODE_OBJS@ - - PYTHON= python$(EXE) - BUILDPYTHON= python$(BUILDEXE) -+HOSTPYTHON= $(BUILDPYTHON) - - # === Definitions added by makesetup === - -@@ -196,7 +197,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar - ########################################################################## - # Parser - PGEN= Parser/pgen$(EXE) -- -+HOSTPGEN= $(PGEN)$(EXE) - POBJS= \ - Parser/acceler.o \ - Parser/grammar1.o \ -@@ -345,8 +346,8 @@ platform: $(BUILDPYTHON) - # 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 -@@ -470,7 +471,7 @@ Modules/python.o: $(srcdir)/Modules/pyth - - - $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) -- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) -+ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) - - $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) -@@ -773,19 +774,19 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib - 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' $(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' $(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 - -@@ -885,7 +886,7 @@ libainstall: all - # Install the dynamically loadable modules - # This goes into $(exec_prefix) - sharedinstall: -- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ -+ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ -Index: Python-2.5.1/setup.py -=================================================================== ---- Python-2.5.1.orig/setup.py -+++ Python-2.5.1/setup.py -@@ -211,6 +211,7 @@ class PyBuildExt(build_ext): - except ImportError, why: - 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 -@@ -244,8 +245,8 @@ class PyBuildExt(build_ext): - - 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. -@@ -341,6 +342,9 @@ class PyBuildExt(build_ext): - - # 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. diff --git a/meta-extras/packages/python/python-2.5.1/default-is-optimized.patch b/meta-extras/packages/python/python-2.5.1/default-is-optimized.patch deleted file mode 100644 index 6beeb6e02..000000000 --- a/meta-extras/packages/python/python-2.5.1/default-is-optimized.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Python-2.5.1/Python/compile.c -=================================================================== ---- Python-2.5.1.orig/Python/compile.c -+++ Python-2.5.1/Python/compile.c -@@ -30,7 +30,7 @@ - #include "symtable.h" - #include "opcode.h" - --int Py_OptimizeFlag = 0; -+int Py_OptimizeFlag = 1; - - /* - ISSUES: diff --git a/meta-extras/packages/python/python-2.5.1/fix-tkinter-detection.patch b/meta-extras/packages/python/python-2.5.1/fix-tkinter-detection.patch deleted file mode 100644 index 93bd34338..000000000 --- a/meta-extras/packages/python/python-2.5.1/fix-tkinter-detection.patch +++ /dev/null @@ -1,41 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: Python-2.5.1/setup.py -=================================================================== ---- Python-2.5.1.orig/setup.py -+++ Python-2.5.1/setup.py -@@ -1227,7 +1227,7 @@ class PyBuildExt(build_ext): - 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 -@@ -1246,22 +1246,6 @@ class PyBuildExt(build_ext): - 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) diff --git a/meta-extras/packages/python/python-2.5.1/sitebranding.patch b/meta-extras/packages/python/python-2.5.1/sitebranding.patch deleted file mode 100644 index c6e486ae9..000000000 --- a/meta-extras/packages/python/python-2.5.1/sitebranding.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: Python-2.5.1/Lib/site.py -=================================================================== ---- Python-2.5.1.orig/Lib/site.py -+++ Python-2.5.1/Lib/site.py -@@ -323,8 +323,9 @@ def setcopyright(): - "Jython is maintained by the Jython developers (www.jython.org).") - else: - __builtin__.credits = _Printer("credits", """\ -- Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands -- for supporting Python development. See www.python.org for more information.""") -+ This version of Python has been built by the OpenEmbedded buildsystem (http://openembedded.org). -+ It is a part of the Python-For-Embedded-Systems initiative which is maintained by -+ Michael 'Mickey' Lauer (http://www.Vanille.de/projects/python.spy).""") - here = os.path.dirname(os.__file__) - __builtin__.license = _Printer( - "license", "See http://www.python.org/%.3s/license.html" % sys.version, diff --git a/meta-extras/packages/python/python-2.5.2/autohell.patch b/meta-extras/packages/python/python-2.5.2/autohell.patch new file mode 100644 index 000000000..32977955d --- /dev/null +++ b/meta-extras/packages/python/python-2.5.2/autohell.patch @@ -0,0 +1,50 @@ +Index: Python-2.5.2/configure.in +=================================================================== +--- Python-2.5.2.orig/configure.in ++++ Python-2.5.2/configure.in +@@ -3410,45 +3410,6 @@ esac + + + +-AC_MSG_CHECKING(for %zd printf() format support) +-AC_TRY_RUN([#include +-#include +-#include +- +-#ifdef HAVE_SYS_TYPES_H +-#include +-#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_MSG_RESULT(yes) +- AC_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])], +- AC_MSG_RESULT(no)) +- + AC_CHECK_TYPE(socklen_t,, + AC_DEFINE(socklen_t,int, + Define to `int' if does not define.),[ diff --git a/meta-extras/packages/python/python-2.5.2/bindir-libdir.patch b/meta-extras/packages/python/python-2.5.2/bindir-libdir.patch new file mode 100644 index 000000000..047c358a5 --- /dev/null +++ b/meta-extras/packages/python/python-2.5.2/bindir-libdir.patch @@ -0,0 +1,20 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: Python-2.5.1/Makefile.pre.in +=================================================================== +--- Python-2.5.1.orig/Makefile.pre.in ++++ Python-2.5.1/Makefile.pre.in +@@ -83,8 +83,8 @@ prefix= @prefix@ + exec_prefix= @exec_prefix@ + + # Expanded directories +-BINDIR= $(exec_prefix)/bin +-LIBDIR= $(exec_prefix)/lib ++BINDIR= @bindir@ ++LIBDIR= @libdir@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ + CONFINCLUDEDIR= $(exec_prefix)/include diff --git a/meta-extras/packages/python/python-2.5.2/crosscompile.patch b/meta-extras/packages/python/python-2.5.2/crosscompile.patch new file mode 100644 index 000000000..f1b1c6f3e --- /dev/null +++ b/meta-extras/packages/python/python-2.5.2/crosscompile.patch @@ -0,0 +1,110 @@ +# +# Patch (C) by Michael 'Mickey' Lauer +# +Index: Python-2.5.2/Makefile.pre.in +=================================================================== +--- Python-2.5.2.orig/Makefile.pre.in ++++ Python-2.5.2/Makefile.pre.in +@@ -173,6 +173,7 @@ UNICODE_OBJS= @UNICODE_OBJS@ + + PYTHON= python$(EXE) + BUILDPYTHON= python$(BUILDEXE) ++HOSTPYTHON= $(BUILDPYTHON) + + # === Definitions added by makesetup === + +@@ -199,7 +200,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar + ########################################################################## + # Parser + PGEN= Parser/pgen$(EXE) +- ++HOSTPGEN= $(PGEN)$(EXE) + POBJS= \ + Parser/acceler.o \ + Parser/grammar1.o \ +@@ -348,8 +349,8 @@ platform: $(BUILDPYTHON) + # 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 +@@ -474,7 +475,7 @@ Modules/python.o: $(srcdir)/Modules/pyth + + $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) + -@ mkdir Include +- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) ++ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) + + $(PGEN): $(PGENOBJS) + $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) +@@ -782,19 +783,19 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib + 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' $(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' $(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 + +@@ -894,7 +895,7 @@ libainstall: all + # Install the dynamically loadable modules + # This goes into $(exec_prefix) + sharedinstall: +- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ ++ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --install-platlib=$(DESTSHARED) \ +Index: Python-2.5.2/setup.py +=================================================================== +--- Python-2.5.2.orig/setup.py ++++ Python-2.5.2/setup.py +@@ -211,6 +211,7 @@ class PyBuildExt(build_ext): + except ImportError, why: + 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 +@@ -244,8 +245,8 @@ class PyBuildExt(build_ext): + + 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. +@@ -342,6 +343,9 @@ class PyBuildExt(build_ext): + + # 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. diff --git a/meta-extras/packages/python/python-2.5.2/default-is-optimized.patch b/meta-extras/packages/python/python-2.5.2/default-is-optimized.patch new file mode 100644 index 000000000..6beeb6e02 --- /dev/null +++ b/meta-extras/packages/python/python-2.5.2/default-is-optimized.patch @@ -0,0 +1,13 @@ +Index: Python-2.5.1/Python/compile.c +=================================================================== +--- Python-2.5.1.orig/Python/compile.c ++++ Python-2.5.1/Python/compile.c +@@ -30,7 +30,7 @@ + #include "symtable.h" + #include "opcode.h" + +-int Py_OptimizeFlag = 0; ++int Py_OptimizeFlag = 1; + + /* + ISSUES: diff --git a/meta-extras/packages/python/python-2.5.2/enable-ctypes-module.patch b/meta-extras/packages/python/python-2.5.2/enable-ctypes-module.patch new file mode 100644 index 000000000..dd5adaf0e --- /dev/null +++ b/meta-extras/packages/python/python-2.5.2/enable-ctypes-module.patch @@ -0,0 +1,106 @@ +diff -Naur Python-2.5.1.orig/setup.py Python-2.5.1/setup.py +--- Python-2.5.orig/setup.py 2006-08-10 01:42:18.000000000 +0200 ++++ Python-2.5/setup.py 2007-11-21 18:00:43.000000000 +0100 +@@ -1321,16 +1329,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, ret %d or missing %s"% (res, ffi_configfile, ) + return False + + fficonfig = {} +diff -Naur Python-2.5.1.orig/Modules/_ctypes/callbacks.c Python-2.5.1/Modules/_ctypes/callbacks.c +--- Python-2.5.1.orig/Modules/_ctypes/callbacks.c 2006-10-17 21:41:10.000000000 +0200 ++++ Python-2.5.1/Modules/_ctypes/callbacks.c 2007-11-22 10:29:33.000000000 +0100 +@@ -273,11 +273,13 @@ + PyErr_NoMemory(); + return NULL; + } ++#if FFI_CLOSURES + p->pcl = MallocClosure(); + if (p->pcl == NULL) { + PyErr_NoMemory(); + goto error; + } ++#endif + + for (i = 0; i < nArgs; ++i) { + PyObject *cnv = PySequence_GetItem(converters, i); +@@ -315,12 +317,14 @@ + "ffi_prep_cif failed with %d", result); + goto error; + } ++#if FFI_CLOSURES + result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p); + if (result != FFI_OK) { + PyErr_Format(PyExc_RuntimeError, + "ffi_prep_closure failed with %d", result); + goto error; + } ++#endif + + p->converters = converters; + p->callable = callable; +@@ -328,8 +332,10 @@ + + error: + if (p) { ++#if FFI_CLOSURES + if (p->pcl) + FreeClosure(p->pcl); ++#endif + PyMem_Free(p); + } + return NULL; +diff -Naur Python-2.5.1.orig/Modules/_ctypes/_ctypes.c Python-2.5.1/Modules/_ctypes/_ctypes.c +--- Python-2.5.1.orig/Modules/_ctypes/_ctypes.c 2007-03-23 20:56:45.000000000 +0100 ++++ Python-2.5.1/Modules/_ctypes/_ctypes.c 2007-11-22 10:29:01.000000000 +0100 +@@ -3419,7 +3419,9 @@ + Py_CLEAR(self->paramflags); + + if (self->thunk) { ++#if FFI_CLOSURES + FreeClosure(self->thunk->pcl); ++#endif + PyMem_Free(self->thunk); + self->thunk = NULL; + } +diff -Naur Python-2.5.1.orig/Modules/_ctypes/ctypes.h Python-2.5.1/Modules/_ctypes/ctypes.h +--- Python-2.5.1.orig/Modules/_ctypes/ctypes.h 2006-08-14 13:17:48.000000000 +0200 ++++ Python-2.5.1/Modules/_ctypes/ctypes.h 2007-11-22 10:29:44.000000000 +0100 +@@ -68,7 +68,9 @@ + }; + + typedef struct { ++#if FFI_CLOSURES + ffi_closure *pcl; /* the C callable */ ++#endif + ffi_cif cif; + PyObject *converters; + PyObject *callable; +diff -Naur Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c Python-2.5.1/Modules/_ctypes/malloc_closure.c +--- Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c 2006-06-12 22:56:48.000000000 +0200 ++++ Python-2.5.1/Modules/_ctypes/malloc_closure.c 2007-11-22 10:30:17.000000000 +0100 +@@ -27,7 +27,9 @@ + /******************************************************************/ + + typedef union _tagITEM { ++#if FFI_CLOSURES + ffi_closure closure; ++#endif + union _tagITEM *next; + } ITEM; + diff --git a/meta-extras/packages/python/python-2.5.2/fix-tkinter-detection.patch b/meta-extras/packages/python/python-2.5.2/fix-tkinter-detection.patch new file mode 100644 index 000000000..93bd34338 --- /dev/null +++ b/meta-extras/packages/python/python-2.5.2/fix-tkinter-detection.patch @@ -0,0 +1,41 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: Python-2.5.1/setup.py +=================================================================== +--- Python-2.5.1.orig/setup.py ++++ Python-2.5.1/setup.py +@@ -1227,7 +1227,7 @@ class PyBuildExt(build_ext): + 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 +@@ -1246,22 +1246,6 @@ class PyBuildExt(build_ext): + 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) diff --git a/meta-extras/packages/python/python-2.5.2/sitebranding.patch b/meta-extras/packages/python/python-2.5.2/sitebranding.patch new file mode 100644 index 000000000..c6e486ae9 --- /dev/null +++ b/meta-extras/packages/python/python-2.5.2/sitebranding.patch @@ -0,0 +1,21 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: Python-2.5.1/Lib/site.py +=================================================================== +--- Python-2.5.1.orig/Lib/site.py ++++ Python-2.5.1/Lib/site.py +@@ -323,8 +323,9 @@ def setcopyright(): + "Jython is maintained by the Jython developers (www.jython.org).") + else: + __builtin__.credits = _Printer("credits", """\ +- Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands +- for supporting Python development. See www.python.org for more information.""") ++ This version of Python has been built by the OpenEmbedded buildsystem (http://openembedded.org). ++ It is a part of the Python-For-Embedded-Systems initiative which is maintained by ++ Michael 'Mickey' Lauer (http://www.Vanille.de/projects/python.spy).""") + here = os.path.dirname(os.__file__) + __builtin__.license = _Printer( + "license", "See http://www.python.org/%.3s/license.html" % sys.version, diff --git a/meta-extras/packages/python/python-2.5.2/sitecustomize.py b/meta-extras/packages/python/python-2.5.2/sitecustomize.py new file mode 100644 index 000000000..ec626b4b6 --- /dev/null +++ b/meta-extras/packages/python/python-2.5.2/sitecustomize.py @@ -0,0 +1,44 @@ +# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer +# GPLv2 or later +# Version: 20082201 +# 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.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() diff --git a/meta-extras/packages/python/python-native-2.5.1/bindir-libdir.patch b/meta-extras/packages/python/python-native-2.5.1/bindir-libdir.patch deleted file mode 100644 index 999bddc44..000000000 --- a/meta-extras/packages/python/python-native-2.5.1/bindir-libdir.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Python-2.3.1/Makefile.pre.in~bindir-libdir 2003-09-20 12:50:28.000000000 +0200 -+++ Python-2.3.1/Makefile.pre.in 2003-11-02 19:53:17.000000000 +0100 -@@ -78,8 +78,8 @@ - exec_prefix= @exec_prefix@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include diff --git a/meta-extras/packages/python/python-native-2.5.1/cross-distutils.patch b/meta-extras/packages/python/python-native-2.5.1/cross-distutils.patch deleted file mode 100644 index 3356c1abb..000000000 --- a/meta-extras/packages/python/python-native-2.5.1/cross-distutils.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Python-2.3.3/Lib/distutils/sysconfig.py~cross-distutils 2003-02-10 15:02:33.000000000 +0100 -+++ Python-2.3.3/Lib/distutils/sysconfig.py 2004-03-02 20:15:05.000000000 +0100 -@@ -19,8 +19,8 @@ - from errors import DistutilsPlatformError - - # These are needed in a couple of spots, so just compute them once. --PREFIX = os.path.normpath(sys.prefix) --EXEC_PREFIX = os.path.normpath(sys.exec_prefix) -+PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) -+EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - # python_build: (Boolean) if true, we're either building Python or - # building an extension with an un-installed Python, so we use -@@ -192,7 +192,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(): -@@ -200,7 +200,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): diff --git a/meta-extras/packages/python/python-native-2.5.1/default-is-optimized.patch b/meta-extras/packages/python/python-native-2.5.1/default-is-optimized.patch deleted file mode 100644 index 6beeb6e02..000000000 --- a/meta-extras/packages/python/python-native-2.5.1/default-is-optimized.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Python-2.5.1/Python/compile.c -=================================================================== ---- Python-2.5.1.orig/Python/compile.c -+++ Python-2.5.1/Python/compile.c -@@ -30,7 +30,7 @@ - #include "symtable.h" - #include "opcode.h" - --int Py_OptimizeFlag = 0; -+int Py_OptimizeFlag = 1; - - /* - ISSUES: diff --git a/meta-extras/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch b/meta-extras/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch deleted file mode 100644 index 54109afd6..000000000 --- a/meta-extras/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Signed off by Michael 'Mickey' Lauer -# - ---- Python-2.4/Lib/distutils/command/build_scripts.py~dont-modify-shebang-line -+++ Python-2.4/Lib/distutils/command/build_scripts.py -@@ -87,7 +87,7 @@ - continue - - match = first_line_re.match(first_line) -- if match: -+ if False: #match: - adjust = 1 - post_interp = match.group(1) or '' - diff --git a/meta-extras/packages/python/python-native-2.5.2/bindir-libdir.patch b/meta-extras/packages/python/python-native-2.5.2/bindir-libdir.patch new file mode 100644 index 000000000..999bddc44 --- /dev/null +++ b/meta-extras/packages/python/python-native-2.5.2/bindir-libdir.patch @@ -0,0 +1,18 @@ + +# +# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- Python-2.3.1/Makefile.pre.in~bindir-libdir 2003-09-20 12:50:28.000000000 +0200 ++++ Python-2.3.1/Makefile.pre.in 2003-11-02 19:53:17.000000000 +0100 +@@ -78,8 +78,8 @@ + exec_prefix= @exec_prefix@ + + # Expanded directories +-BINDIR= $(exec_prefix)/bin +-LIBDIR= $(exec_prefix)/lib ++BINDIR= @bindir@ ++LIBDIR= @libdir@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ + CONFINCLUDEDIR= $(exec_prefix)/include diff --git a/meta-extras/packages/python/python-native-2.5.2/cross-distutils.patch b/meta-extras/packages/python/python-native-2.5.2/cross-distutils.patch new file mode 100644 index 000000000..3356c1abb --- /dev/null +++ b/meta-extras/packages/python/python-native-2.5.2/cross-distutils.patch @@ -0,0 +1,36 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- Python-2.3.3/Lib/distutils/sysconfig.py~cross-distutils 2003-02-10 15:02:33.000000000 +0100 ++++ Python-2.3.3/Lib/distutils/sysconfig.py 2004-03-02 20:15:05.000000000 +0100 +@@ -19,8 +19,8 @@ + from errors import DistutilsPlatformError + + # These are needed in a couple of spots, so just compute them once. +-PREFIX = os.path.normpath(sys.prefix) +-EXEC_PREFIX = os.path.normpath(sys.exec_prefix) ++PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) ++EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) + + # python_build: (Boolean) if true, we're either building Python or + # building an extension with an un-installed Python, so we use +@@ -192,7 +192,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(): +@@ -200,7 +200,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): diff --git a/meta-extras/packages/python/python-native-2.5.2/default-is-optimized.patch b/meta-extras/packages/python/python-native-2.5.2/default-is-optimized.patch new file mode 100644 index 000000000..6beeb6e02 --- /dev/null +++ b/meta-extras/packages/python/python-native-2.5.2/default-is-optimized.patch @@ -0,0 +1,13 @@ +Index: Python-2.5.1/Python/compile.c +=================================================================== +--- Python-2.5.1.orig/Python/compile.c ++++ Python-2.5.1/Python/compile.c +@@ -30,7 +30,7 @@ + #include "symtable.h" + #include "opcode.h" + +-int Py_OptimizeFlag = 0; ++int Py_OptimizeFlag = 1; + + /* + ISSUES: diff --git a/meta-extras/packages/python/python-native-2.5.2/dont-modify-shebang-line.patch b/meta-extras/packages/python/python-native-2.5.2/dont-modify-shebang-line.patch new file mode 100644 index 000000000..54109afd6 --- /dev/null +++ b/meta-extras/packages/python/python-native-2.5.2/dont-modify-shebang-line.patch @@ -0,0 +1,16 @@ + +# +# Signed off by Michael 'Mickey' Lauer +# + +--- Python-2.4/Lib/distutils/command/build_scripts.py~dont-modify-shebang-line ++++ Python-2.4/Lib/distutils/command/build_scripts.py +@@ -87,7 +87,7 @@ + continue + + match = first_line_re.match(first_line) +- if match: ++ if False: #match: + adjust = 1 + post_interp = match.group(1) or '' + diff --git a/meta-extras/packages/python/python_2.5.1.bb b/meta-extras/packages/python/python_2.5.1.bb deleted file mode 100644 index 63b7c368a..000000000 --- a/meta-extras/packages/python/python_2.5.1.bb +++ /dev/null @@ -1,96 +0,0 @@ -DESCRIPTION = "Python Programming Language" -HOMEPAGE = "http://www.python.org" -LICENSE = "PSF" -SECTION = "devel/python" -PRIORITY = "optional" -DEPENDS = "python-native readline zlib gdbm openssl sqlite3" -DEPENDS_sharprom = "python-native readline zlib gdbm openssl" - -# NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py -PR = "ml1" - -PYTHON_MAJMIN = "2.5" - -SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://crosscompile.patch;patch=1 \ - file://fix-tkinter-detection.patch;patch=1 \ - file://autohell.patch;patch=1 \ - file://sitebranding.patch;patch=1 \ - file://default-is-optimized.patch;patch=1" -S = "${WORKDIR}/Python-${PV}" - -inherit autotools - -EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ - --without-cxx --with-signal-module --with-wctype-functions \ - --enable-shared" - -# -# copy config.h and an appropriate Makefile for distutils.sysconfig -# which laters uses the information out of these to compile extensions -# -do_compile_prepend() { - install -d ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ - install -d ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ - install -m 0644 pyconfig.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ - install -m 0644 Makefile Makefile.orig - install -m 0644 Makefile Makefile.backup - sed -e 's,${includedir},${STAGING_INCDIR},' < Makefile.backup > Makefile - install -m 0644 Makefile Makefile.backup - sed -e 's,${libdir},${STAGING_LIBDIR},' < Makefile.backup > Makefile - install -m 0644 Makefile ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ -} - -do_compile() { - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - OPT="${CFLAGS}" libpython2.5.so - - oe_libinstall -so libpython2.5 ${STAGING_LIBDIR} - - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - OPT="${CFLAGS}" -} - -do_stage() { - install -m 0644 Include/*.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ - oe_libinstall -a -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR} -} - -do_install() { - install -m 0644 Makefile.orig Makefile - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ - HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ - STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - DESTDIR=${D} LIBDIR=${libdir} install -} - -require python-${PYTHON_MAJMIN}-manifest.inc - -RPROVIDES_python-core = "python" -RPROVIDES_python-curses = "python" - -PACKAGES =+ "libpython2" -FILES_libpython2 = "${libdir}/libpython*" - -# catch debug extensions -FILES_python-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" - -# catch all the rest (unsorted) -PACKAGES += "python-misc" -FILES_python-misc = "${libdir}/python${PYTHON_MAJMIN}" - -# catch manpage -PACKAGES += "python-man" -FILES_python-man = "${datadir}/man" - diff --git a/meta-extras/packages/python/python_2.5.2.bb b/meta-extras/packages/python/python_2.5.2.bb new file mode 100644 index 000000000..1ac48f368 --- /dev/null +++ b/meta-extras/packages/python/python_2.5.2.bb @@ -0,0 +1,105 @@ +DESCRIPTION = "Python Programming Language" +HOMEPAGE = "http://www.python.org" +LICENSE = "PSF" +SECTION = "devel/python" +PRIORITY = "optional" +DEPENDS = "python-native readline zlib gdbm openssl sqlite3" +DEPENDS_sharprom = "python-native readline zlib gdbm openssl" +PR = "ml1" + +PYTHON_MAJMIN = "2.5" + +SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ + file://bindir-libdir.patch;patch=1 \ + file://crosscompile.patch;patch=1 \ + file://fix-tkinter-detection.patch;patch=1 \ + file://autohell.patch;patch=1 \ + file://sitebranding.patch;patch=1 \ + file://enable-ctypes-module.patch;patch=1 \ + file://default-is-optimized.patch;patch=1 \ + file://sitecustomize.py" +S = "${WORKDIR}/Python-${PV}" + +inherit autotools + +EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ + --without-cxx --with-signal-module --with-wctype-functions \ + --enable-shared" + +# +# copy config.h and an appropriate Makefile for distutils.sysconfig +# which laters uses the information out of these to compile extensions +# +do_compile_prepend() { + install -d ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ + install -d ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ + install -m 0644 pyconfig.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ + install -m 0644 Makefile Makefile.orig + install -m 0644 Makefile Makefile.backup + sed -e 's,${includedir},${STAGING_INCDIR},' < Makefile.backup > Makefile + install -m 0644 Makefile Makefile.backup + sed -e 's,${libdir},${STAGING_LIBDIR},' < Makefile.backup > Makefile + install -m 0644 Makefile ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ +} + +do_compile() { + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + OPT="${CFLAGS}" libpython2.5.so + + oe_libinstall -so libpython2.5 ${STAGING_LIBDIR} + + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + OPT="${CFLAGS}" +} + +do_stage() { + install -m 0644 Include/*.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ + oe_libinstall -a -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR} +} + +do_install() { + install -m 0644 Makefile.orig Makefile + + oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ + HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + DESTDIR=${D} LIBDIR=${libdir} install + + install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} +} + +require python-${PYTHON_MAJMIN}-manifest.inc + +# manual dependency additions +RPROVIDES_python-core = "python" +RRECOMMENDS_python-core = "python-readline" +RRECOMMENDS_python-crypt = "openssl" + +# add sitecustomize +FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py" + +# package libpython +PACKAGES =+ "libpython2" +FILES_libpython2 = "${libdir}/libpython*" + +# catch debug extensions +FILES_python-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" + +# catch all the rest (unsorted) +PACKAGES += "python-misc" +FILES_python-misc = "${libdir}/python${PYTHON_MAJMIN}" + +# catch manpage +PACKAGES += "python-man" +FILES_python-man = "${datadir}/man" + -- cgit v1.2.3