diff options
| author |   Michael Lauer <mickey@vanille-media.de> | 2007-08-15 19:53:43 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-08-15 19:53:43 +0000 |
| commit | 7b8667fa75578f7e6a4958a851296a02e27eb34e (patch) | |
| tree | f465a69f392047ac31235e022f6e5244e402afe8 | |
| parent | 30bc4fa5064b1513537ba9410336dfffe77a659c (diff) | |
| download | openembedded-7b8667fa75578f7e6a4958a851296a02e27eb34e.tar.gz | |
major python upgrade: add python[-native] 2.5.1, rename python-2.4 package
26 files changed, 727 insertions, 1 deletions
diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc new file mode 100644 index 0000000000..6e2427a322 --- /dev/null +++ b/packages/python/python-2.5-manifest.inc @@ -0,0 +1,296 @@ +######################################################################################################################## +### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Wed Aug 15 19:49:20 2007 +### +### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy +### +### Warning: Manual edits will be lost! +### +######################################################################################################################## + + +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 " + +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 " + +DESCRIPTION_python-profile="Python Basic Profiling Support" +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="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="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="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="ml0" +RDEPENDS_python-codecs="python-core" +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-pickle="Python Persistence Support" +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="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="ml2" +RDEPENDS_python-core="" +FILES_python-core="/usr/lib/python2.5/__future__.* /usr/lib/python2.5/copy.* /usr/lib/python2.5/copy_reg.* /usr/lib/python2.5/ConfigParser.* /usr/lib/python2.5/getopt.* /usr/lib/python2.5/linecache.* /usr/lib/python2.5/new.* /usr/lib/python2.5/os.* /usr/lib/python2.5/posixpath.* /usr/lib/python2.5/warnings.* /usr/lib/python2.5/site.* /usr/lib/python2.5/stat.* /usr/lib/python2.5/UserDict.* /usr/lib/python2.5/UserList.* /usr/lib/python2.5/UserString.* /usr/lib/python2.5/lib-dynload/binascii.so /usr/lib/python2.5/lib-dynload/struct.so /usr/lib/python2.5/lib-dynload/time.so /usr/lib/python2.5/lib-dynload/xreadlines.so /usr/lib/python2.5/types.* /usr/bin/python* " + +DESCRIPTION_python-io="Python Low-Level I/O" +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="ml0" +RDEPENDS_python-compiler="python-core" +FILES_python-compiler="${libdir}/python2.5/compiler " + +DESCRIPTION_python-compression="Python High Level Compression Support" +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="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="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="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="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="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-core-dbg="Python core module debug information" +PR_python-core-dbg="ml0" +RDEPENDS_python-core-dbg="python-core" +FILES_python-core-dbg="/usr/lib/python2.5/lib-dynload/.debug /usr/bin/.debug /usr/lib/.debug " + +DESCRIPTION_python-resource="Python Resource Control Interface" +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="ml0" +RDEPENDS_python-devel="python-core" +FILES_python-devel="/usr/include /usr/lib/python2.5/config " + +DESCRIPTION_python-math="Python Math Support" +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="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="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="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="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="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="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="ml0" +RDEPENDS_python-netclient="python-core 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="ml0" +RDEPENDS_python-pprint="python-core" +FILES_python-pprint="${libdir}/python2.5/pprint.* " + +DESCRIPTION_python-netserver="Python Internet Protocol Servers" +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="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="ml0" +RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime" +FILES_python-smtpd="/usr/bin/smtpd.* " + +DESCRIPTION_python-html="Python HTML Processing" +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="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="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="ml0" +RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" +FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.5/pydoc.* " + +DESCRIPTION_python-logging="Python Logging Support" +PR_python-logging="ml0" +RDEPENDS_python-logging="python-core" +FILES_python-logging="${libdir}/python2.5/logging " + +DESCRIPTION_python-mailbox="Python Mailbox Format Support" +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="ml0" +RDEPENDS_python-xml="python-core python-re" +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="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="ml0" +RDEPENDS_python-sqlite3="python-core" +FILES_python-sqlite3="${libdir}/python2.5/sqlite3 " + +DESCRIPTION_python-tests="Python Tests" +PR_python-tests="ml0" +RDEPENDS_python-tests="python-core" +FILES_python-tests="${libdir}/python2.5/test " + +DESCRIPTION_python-unittest="Python Unit Testing Framework" +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="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="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="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="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="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="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="ml0" +RDEPENDS_python-bsddb="python-core" +FILES_python-bsddb="${libdir}/python2.5/bsddb " + +DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" +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="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="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="ml0" +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 " + +DESCRIPTION_python-idle="Python Integrated Development Environment" +PR_python-idle="ml0" +RDEPENDS_python-idle="python-core python-tkinter" +FILES_python-idle="/usr/bin/idle /usr/lib/python2.5/idlelib " + +DESCRIPTION_python-lang="Python Low-Level Language Support" +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="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/packages/python/python-2.4.4/.mtn2git_empty b/packages/python/python-2.5.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/python/python-2.4.4/.mtn2git_empty +++ b/packages/python/python-2.5.1/.mtn2git_empty diff --git a/packages/python/python-2.5.1/autohell.patch b/packages/python/python-2.5.1/autohell.patch new file mode 100644 index 0000000000..e2d63145be --- /dev/null +++ b/packages/python/python-2.5.1/autohell.patch @@ -0,0 +1,49 @@ +# +# 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 <stdio.h> +-#include <stddef.h> +-#include <string.h> +- +-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 <sys/socket.h> does not define.),[ diff --git a/packages/python/python-2.5.1/bindir-libdir.patch b/packages/python/python-2.5.1/bindir-libdir.patch new file mode 100644 index 0000000000..047c358a55 --- /dev/null +++ b/packages/python/python-2.5.1/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/packages/python/python-2.5.1/crosscompile.patch b/packages/python/python-2.5.1/crosscompile.patch new file mode 100644 index 0000000000..f456048ef5 --- /dev/null +++ b/packages/python/python-2.5.1/crosscompile.patch @@ -0,0 +1,110 @@ +# +# Patch (C) by Michael 'Mickey' Lauer <mlauer@vanille-media.de> +# +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/packages/python/python-2.5.1/fix-tkinter-detection.patch b/packages/python/python-2.5.1/fix-tkinter-detection.patch new file mode 100644 index 0000000000..93bd343381 --- /dev/null +++ b/packages/python/python-2.5.1/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/packages/python/python-2.5.1/sitebranding.patch b/packages/python/python-2.5.1/sitebranding.patch new file mode 100644 index 0000000000..c6e486ae97 --- /dev/null +++ b/packages/python/python-2.5.1/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/packages/python/python-native-2.4.0/.mtn2git_empty b/packages/python/python-native-2.5.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/python/python-native-2.4.0/.mtn2git_empty +++ b/packages/python/python-native-2.5.1/.mtn2git_empty diff --git a/packages/python/python-native-2.4.0/bindir-libdir.patch b/packages/python/python-native-2.5.1/bindir-libdir.patch index 999bddc449..999bddc449 100644 --- a/packages/python/python-native-2.4.0/bindir-libdir.patch +++ b/packages/python/python-native-2.5.1/bindir-libdir.patch diff --git a/packages/python/python-native-2.4.0/cross-distutils.patch b/packages/python/python-native-2.5.1/cross-distutils.patch index 76ae883c1d..76ae883c1d 100644 --- a/packages/python/python-native-2.4.0/cross-distutils.patch +++ b/packages/python/python-native-2.5.1/cross-distutils.patch diff --git a/packages/python/python-native-2.4.0/dont-modify-shebang-line.patch b/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch index 54109afd62..54109afd62 100644 --- a/packages/python/python-native-2.4.0/dont-modify-shebang-line.patch +++ b/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb new file mode 100644 index 0000000000..e0b09cb861 --- /dev/null +++ b/packages/python/python-native_2.5.1.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "The Python Programming Language" +HOMEPAGE = "http://www.python.org" +LICENSE = "PSF" +SECTION = "devel/python" +PRIORITY = "optional" +DEPENDS = "" +PR = "ml0" + +EXCLUDE_FROM_WORLD = "1" + +SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ + file://bindir-libdir.patch;patch=1 \ + file://cross-distutils.patch;patch=1 \ + file://dont-modify-shebang-line.patch;patch=1" +S = "${WORKDIR}/Python-${PV}" + +inherit autotools native + +prefix = "${STAGING_DIR}/${BUILD_SYS}" +exec_prefix = "${STAGING_DIR}/${BUILD_SYS}" + +EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ + --without-cxx --with-signal-module --with-wctype-functions" +EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' + +#do_configure() { +# # the autofoo stuff is too old to allow regenerating +# oe_runconf +#} + +do_stage_append() { + install -m 0755 Parser/pgen ${STAGING_DIR}/${BUILD_SYS}/bin/ +} diff --git a/packages/python/python24-2.4.4/.mtn2git_empty b/packages/python/python24-2.4.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python24-2.4.4/.mtn2git_empty diff --git a/packages/python/python-2.4.4/autohell.patch b/packages/python/python24-2.4.4/autohell.patch index b0eebb9ce8..b0eebb9ce8 100644 --- a/packages/python/python-2.4.4/autohell.patch +++ b/packages/python/python24-2.4.4/autohell.patch diff --git a/packages/python/python-2.4.4/bindir-libdir.patch b/packages/python/python24-2.4.4/bindir-libdir.patch index 27ae5dce5b..27ae5dce5b 100644 --- a/packages/python/python-2.4.4/bindir-libdir.patch +++ b/packages/python/python24-2.4.4/bindir-libdir.patch diff --git a/packages/python/python-2.4.4/crosscompile.patch b/packages/python/python24-2.4.4/crosscompile.patch index f917bb2567..f917bb2567 100644 --- a/packages/python/python-2.4.4/crosscompile.patch +++ b/packages/python/python24-2.4.4/crosscompile.patch diff --git a/packages/python/python-2.4.4/fix-tkinter-detection.patch b/packages/python/python24-2.4.4/fix-tkinter-detection.patch index 602aa8e021..602aa8e021 100644 --- a/packages/python/python-2.4.4/fix-tkinter-detection.patch +++ b/packages/python/python24-2.4.4/fix-tkinter-detection.patch diff --git a/packages/python/python-2.4.4/sitebranding.patch b/packages/python/python24-2.4.4/sitebranding.patch index 85bb83a506..85bb83a506 100644 --- a/packages/python/python-2.4.4/sitebranding.patch +++ b/packages/python/python24-2.4.4/sitebranding.patch diff --git a/packages/python/python-2.4.4-manifest.inc b/packages/python/python24-manifest.inc index d08235e42e..d08235e42e 100644 --- a/packages/python/python-2.4.4-manifest.inc +++ b/packages/python/python24-manifest.inc diff --git a/packages/python/python24-native-2.4.0/.mtn2git_empty b/packages/python/python24-native-2.4.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python24-native-2.4.0/.mtn2git_empty diff --git a/packages/python/python24-native-2.4.0/bindir-libdir.patch b/packages/python/python24-native-2.4.0/bindir-libdir.patch new file mode 100644 index 0000000000..999bddc449 --- /dev/null +++ b/packages/python/python24-native-2.4.0/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/packages/python/python24-native-2.4.0/cross-distutils.patch b/packages/python/python24-native-2.4.0/cross-distutils.patch new file mode 100644 index 0000000000..76ae883c1d --- /dev/null +++ b/packages/python/python24-native-2.4.0/cross-distutils.patch @@ -0,0 +1,38 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- Python-2.3.3/Lib/distutils/sysconfig.py~cross-distutils 2003-02-10 15:02:33.000000000 +0100 ++++ Python-2.3.3/Lib/distutils/sysconfig.py 2004-03-02 20:15:05.000000000 +0100 +@@ -19,8 +19,8 @@ + from errors import DistutilsPlatformError + + # These are needed in a couple of spots, so just compute them once. +-PREFIX = os.path.normpath(sys.prefix) +-EXEC_PREFIX = os.path.normpath(sys.exec_prefix) ++PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) ++EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) + + # python_build: (Boolean) if true, we're either building Python or + # building an extension with an un-installed Python, so we use +@@ -192,7 +192,8 @@ + else: + # The name of the config.h file changed in 2.2 + config_h = 'pyconfig.h' +- return os.path.join(inc_dir, config_h) ++ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded" ++ return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) + + + def get_makefile_filename(): +@@ -200,7 +201,8 @@ + if python_build: + return os.path.join(os.path.dirname(sys.executable), "Makefile") + lib_dir = get_python_lib(plat_specific=1, standard_lib=1) +- return os.path.join(lib_dir, "config", "Makefile") ++ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded" ++ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) + + + def parse_config_h(fp, g=None): diff --git a/packages/python/python24-native-2.4.0/dont-modify-shebang-line.patch b/packages/python/python24-native-2.4.0/dont-modify-shebang-line.patch new file mode 100644 index 0000000000..54109afd62 --- /dev/null +++ b/packages/python/python24-native-2.4.0/dont-modify-shebang-line.patch @@ -0,0 +1,16 @@ + +# +# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de> +# + +--- Python-2.4/Lib/distutils/command/build_scripts.py~dont-modify-shebang-line ++++ Python-2.4/Lib/distutils/command/build_scripts.py +@@ -87,7 +87,7 @@ + continue + + match = first_line_re.match(first_line) +- if match: ++ if False: #match: + adjust = 1 + post_interp = match.group(1) or '' + diff --git a/packages/python/python-native_2.4.0.bb b/packages/python/python24-native_2.4.0.bb index 5e948965ad..5e948965ad 100644 --- a/packages/python/python-native_2.4.0.bb +++ b/packages/python/python24-native_2.4.0.bb diff --git a/packages/python/python_2.4.4.bb b/packages/python/python24_2.4.4.bb index 6ec186cb83..313075094e 100644 --- a/packages/python/python_2.4.4.bb +++ b/packages/python/python24_2.4.4.bb @@ -62,7 +62,7 @@ do_install() { DESTDIR=${D} install } -require python-${PV}-manifest.inc +require python24-manifest.inc RPROVIDES_python-core = "python" RPROVIDES_python-curses = "python" diff --git a/packages/python/python_2.5.1.bb b/packages/python/python_2.5.1.bb new file mode 100644 index 0000000000..a9d37a1ebb --- /dev/null +++ b/packages/python/python_2.5.1.bb @@ -0,0 +1,84 @@ +DESCRIPTION = "Python Programming Language" +HOMEPAGE = "http://www.python.org" +LICENSE = "PSF" +SECTION = "devel/python" +PRIORITY = "optional" +DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" +DEPENDS_sharprom = "python-native readline zlib gdbm openssl" +PR = "ml0" + +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" +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}" +} + +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} 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" + |