diff options
33 files changed, 0 insertions, 3442 deletions
diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc deleted file mode 100644 index 5ca6f83859..0000000000 --- a/packages/python/python-2.5-manifest.inc +++ /dev/null @@ -1,325 +0,0 @@ -# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. -# Generator: './generate-manifest-2.5.py' Version 20081209 (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de> -# Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy - - - -PROVIDES+="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-bzip2 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-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree 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-compile python-debugger python-pkgutil 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-doctest python-codecs python-ctypes python-pickle python-bzip2 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-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree 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-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-modules" - -DESCRIPTION_python-profile="Python Basic Profiling Support" -PR_python-profile="ml0" -RDEPENDS_python-profile="python-core python-textutils" -FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* ${libdir}/python2.5/cProfile.* ${libdir}/python2.5/lib-dynload/_lsprof.so " - -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-doctest="Python framework for running examples in docstrings." -PR_python-doctest="ml0" -RDEPENDS_python-doctest="python-core python-lang python-io python-re python-unittest python-debugger python-difflib" -FILES_python-doctest="${libdir}/python2.5/doctest.* " - -DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" -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="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-bzip2="Python bzip2 support" -PR_python-bzip2="ml0" -RDEPENDS_python-bzip2="python-core" -FILES_python-bzip2="${libdir}/python2.5/lib-dynload/bz2.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="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/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="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.* ${libdir}/python2.5/tarfile.* " - -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-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="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="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="${includedir} ${libdir}/python2.5/config " - -DESCRIPTION_python-difflib="Python helpers for computing deltas between objects." -PR_python-difflib="ml0" -RDEPENDS_python-difflib="python-lang python-re" -FILES_python-difflib="${libdir}/python2.5/difflib.* " - -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-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-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-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-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-elementtree="Python elementree" -PR_python-elementtree="ml0" -RDEPENDS_python-elementtree="python-core" -FILES_python-elementtree="${libdir}/python2.5/lib-dynload/_elementtree.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-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.* ${libdir}/python2.5/uuid.* " - -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="${bindir}/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="${bindir}/pydoc ${libdir}/python2.5/pydoc.* " - -DESCRIPTION_python-logging="Python Logging Support" -PR_python-logging="ml0" -RDEPENDS_python-logging="python-core python-io python-lang python-pickle python-stringold" -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 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-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="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-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 python-pprint" -FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " - -DESCRIPTION_python-pkgutil="Python Package Extension Utility Support" -PR_python-pkgutil="ml0" -RDEPENDS_python-pkgutil="python-core" -FILES_python-pkgutil="${libdir}/python2.5/pkgutil.* " - -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/shlex.* ${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 ${libdir}/python2.5/lib-dynload/_bsddb.so " - -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/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="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="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/symbol.* ${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 " - -DESCRIPTION_python-modules="All Python modules" -RDEPENDS_python-modules="python-profile python-threading python-distutils python-doctest python-codecs python-ctypes python-pickle python-bzip2 python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-resource python-devel python-difflib python-math python-syslog python-hotshot python-unixadmin python-textutils python-tkinter python-gdbm python-elementtree 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-compile python-debugger python-pkgutil python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " -ALLOW_EMPTY_python-modules = "1" - - diff --git a/packages/python/python-2.5.2/05-install.patch b/packages/python/python-2.5.2/05-install.patch deleted file mode 100644 index c3e249db1c..0000000000 --- a/packages/python/python-2.5.2/05-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: python/Lib/distutils/command/install.py -=================================================================== ---- python.orig/Lib/distutils/command/install.py 2007-03-06 17:15:43.000000000 -0300 -+++ python/Lib/distutils/command/install.py 2007-03-06 17:16:04.000000000 -0300 -@@ -601,7 +601,7 @@ - ('install_headers', has_headers), - ('install_scripts', has_scripts), - ('install_data', has_data), -- ('install_egg_info', lambda self:True), -+ ('install_egg_info', lambda self:False), - ] - - # class install diff --git a/packages/python/python-2.5.2/06-fix-urllib-exception.patch b/packages/python/python-2.5.2/06-fix-urllib-exception.patch deleted file mode 100644 index d096ee9402..0000000000 --- a/packages/python/python-2.5.2/06-fix-urllib-exception.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: python/Lib/urllib.py -=================================================================== ---- python.orig/Lib/urllib.py 2007-03-06 17:16:49.000000000 -0300 -+++ python/Lib/urllib.py 2007-03-06 17:17:05.000000000 -0300 -@@ -358,7 +358,7 @@ - """Default error handler: close the connection and raise IOError.""" - void = fp.read() - fp.close() -- raise IOError, ('http error', errcode, errmsg, headers) -+ raise IOError, ('http error', errcode, errmsg) - - if hasattr(socket, "ssl"): - def open_https(self, url, data=None): diff --git a/packages/python/python-2.5.2/13-set-wakeup-fix.patch b/packages/python/python-2.5.2/13-set-wakeup-fix.patch deleted file mode 100644 index 807014b7a7..0000000000 --- a/packages/python/python-2.5.2/13-set-wakeup-fix.patch +++ /dev/null @@ -1,87 +0,0 @@ -Index: python-2.5.2/Modules/signalmodule.c -=================================================================== ---- python-2.5.2.orig/Modules/signalmodule.c 2008-02-23 13:10:12.000000000 -0300 -+++ python-2.5.2/Modules/signalmodule.c 2008-02-23 13:10:48.000000000 -0300 -@@ -12,6 +12,8 @@ - - #include <signal.h> - -+#include <sys/stat.h> -+ - #ifndef SIG_ERR - #define SIG_ERR ((PyOS_sighandler_t)(-1)) - #endif -@@ -75,6 +77,8 @@ - PyObject *func; - } Handlers[NSIG]; - -+static sig_atomic_t wakeup_fd = -1; -+ - /* Speed up sigcheck() when none tripped */ - static volatile sig_atomic_t is_tripped = 0; - -@@ -113,6 +117,7 @@ - static void - signal_handler(int sig_num) - { -+ const char dummy_byte = '\0'; - #ifdef WITH_THREAD - #ifdef WITH_PTH - if (PyThread_get_thread_ident() != main_thread) { -@@ -128,6 +133,8 @@ - cleared in PyErr_CheckSignals() before .tripped. */ - is_tripped = 1; - Py_AddPendingCall(checksignals_witharg, NULL); -+ if (wakeup_fd != -1) -+ write(wakeup_fd, &dummy_byte, 1); - #ifdef WITH_THREAD - } - #endif -@@ -267,6 +274,39 @@ - anything else -- the callable Python object used as a handler"); - - -+static PyObject * -+signal_set_wakeup_fd(PyObject *self, PyObject *args) -+{ -+ struct stat buf; -+ int fd, old_fd; -+ if (!PyArg_ParseTuple(args, "i:set_wakeup_fd", &fd)) -+ return NULL; -+#ifdef WITH_THREAD -+ if (PyThread_get_thread_ident() != main_thread) { -+ PyErr_SetString(PyExc_ValueError, -+ "set_wakeup_fd only works in main thread"); -+ return NULL; -+ } -+#endif -+ if (fd != -1 && fstat(fd, &buf) != 0) { -+ PyErr_SetString(PyExc_ValueError, "invalid fd"); -+ return NULL; -+ } -+ old_fd = wakeup_fd; -+ wakeup_fd = fd; -+ return PyLong_FromLong(old_fd); -+} -+ -+PyDoc_STRVAR(set_wakeup_fd_doc, -+"set_wakeup_fd(fd) -> fd\n\ -+\n\ -+Sets the fd to be written to (with '\\0') when a signal\n\ -+comes in. A library can use this to wakeup select or poll.\n\ -+The previous fd is returned.\n\ -+\n\ -+The fd must be non-blocking."); -+ -+ - /* List of functions defined in the module */ - static PyMethodDef signal_methods[] = { - #ifdef HAVE_ALARM -@@ -274,6 +314,7 @@ - #endif - {"signal", signal_signal, METH_VARARGS, signal_doc}, - {"getsignal", signal_getsignal, METH_VARARGS, getsignal_doc}, -+ {"set_wakeup_fd", signal_set_wakeup_fd, METH_VARARGS, set_wakeup_fd_doc}, - #ifdef HAVE_PAUSE - {"pause", (PyCFunction)signal_pause, - METH_NOARGS,pause_doc}, diff --git a/packages/python/python-2.5.2/14-encodings-oriental.patch b/packages/python/python-2.5.2/14-encodings-oriental.patch deleted file mode 100644 index 4c942f1b75..0000000000 --- a/packages/python/python-2.5.2/14-encodings-oriental.patch +++ /dev/null @@ -1,64 +0,0 @@ -Index: python-2.5.2/debian/rules -=================================================================== ---- python-2.5.2.orig/debian/rules 2008-02-26 14:15:36.000000000 -0300 -+++ python-2.5.2/debian/rules 2008-02-26 14:17:42.000000000 -0300 -@@ -134,6 +134,8 @@ - ) - find $(d_dev)/$(scriptdir) -name "*.pyo" -type f | grep -v -f $(only_dev_list) | xargs rm -f - -+ find $(d_dev)/$(scriptdir)/encodings | grep -f $(only_dev_list) | xargs -i mv '{}' $(d_dev)/$(scriptdir)/encodings_orient -+ - # move the interpreter - mv $(d_dev)/usr/bin/python2.5 $(d_base)/usr/bin/python2.5 - -Index: python-2.5.2/Lib/encodings/__init__.py -=================================================================== ---- python-2.5.2.orig/Lib/encodings/__init__.py 2008-02-26 14:15:07.000000000 -0300 -+++ python-2.5.2/Lib/encodings/__init__.py 2008-02-26 14:17:42.000000000 -0300 -@@ -99,6 +99,14 @@ - pass - else: - break -+ -+ try: -+ mod = __import__('encodings_orient.' + modname, -+ globals(), locals(), _import_tail) -+ except ImportError: -+ pass -+ else: -+ break - else: - mod = None - -Index: python-2.5.2/Makefile.pre.in -=================================================================== ---- python-2.5.2.orig/Makefile.pre.in 2008-02-26 14:15:07.000000000 -0300 -+++ python-2.5.2/Makefile.pre.in 2008-02-26 14:17:42.000000000 -0300 -@@ -717,7 +717,7 @@ - PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages - LIBSUBDIRS= lib-tk site-packages test test/output test/data \ - test/decimaltestdata \ -- encodings compiler hotshot \ -+ encodings encodings_orient compiler hotshot \ - email email/mime email/test email/test/data \ - sqlite3 sqlite3/test \ - logging bsddb bsddb/test csv wsgiref \ -Index: python-2.5.2/debian/onlysdk -=================================================================== ---- python-2.5.2.orig/debian/onlysdk 2008-02-26 14:15:07.000000000 -0300 -+++ python-2.5.2/debian/onlysdk 2008-02-26 14:17:42.000000000 -0300 -@@ -1,7 +1,6 @@ - distutils - compile --encodings/cp --encodings/mac -+encodings_orient - doctest - unittest - hotshot -Index: python-2.5.2/Lib/encodings_orient/__init__.py -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ python-2.5.2/Lib/encodings_orient/__init__.py 2008-02-26 14:17:42.000000000 -0300 -@@ -0,0 +1 @@ -+#Dummy diff --git a/packages/python/python-2.5.2/16-bug1179-imageop.patch b/packages/python/python-2.5.2/16-bug1179-imageop.patch deleted file mode 100644 index 895d4e0a17..0000000000 --- a/packages/python/python-2.5.2/16-bug1179-imageop.patch +++ /dev/null @@ -1,219 +0,0 @@ -Index: python-2.5.2/Modules/imageop.c -=================================================================== ---- python-2.5.2.orig/Modules/imageop.c 2006-01-19 03:09:39.000000000 -0300 -+++ python-2.5.2/Modules/imageop.c 2008-04-07 16:29:09.000000000 -0300 -@@ -78,7 +78,7 @@ - char *cp, *ncp; - short *nsp; - Py_Int32 *nlp; -- int len, size, x, y, newx1, newx2, newy1, newy2; -+ int len, size, x, y, newx1, newx2, newy1, newy2, nlen; - int ix, iy, xstep, ystep; - PyObject *rv; - -@@ -90,13 +90,19 @@ - PyErr_SetString(ImageopError, "Size should be 1, 2 or 4"); - return 0; - } -- if ( len != size*x*y ) { -+ if (( len != size*x*y ) || -+ ( size != ((len / x) / y) )) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; - } - xstep = (newx1 < newx2)? 1 : -1; - ystep = (newy1 < newy2)? 1 : -1; - -+ nlen = (abs(newx2-newx1)+1)*(abs(newy2-newy1)+1)*size; -+ if ( size != ((nlen / (abs(newx2-newx1)+1)) / (abs(newy2-newy1)+1)) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } - rv = PyString_FromStringAndSize(NULL, - (abs(newx2-newx1)+1)*(abs(newy2-newy1)+1)*size); - if ( rv == 0 ) -@@ -132,7 +138,7 @@ - char *cp, *ncp; - short *nsp; - Py_Int32 *nlp; -- int len, size, x, y, newx, newy; -+ int len, size, x, y, newx, newy, nlen; - int ix, iy; - int oix, oiy; - PyObject *rv; -@@ -145,12 +151,18 @@ - PyErr_SetString(ImageopError, "Size should be 1, 2 or 4"); - return 0; - } -- if ( len != size*x*y ) { -+ if ( ( len != size*x*y ) || -+ ( size != ((len / x) / y) ) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } -+ nlen = newx*newy*size; -+ if ( size != ((nlen / newx) / newy) ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; - } - -- rv = PyString_FromStringAndSize(NULL, newx*newy*size); -+ rv = PyString_FromStringAndSize(NULL, nlen); - if ( rv == 0 ) - return 0; - ncp = (char *)PyString_AsString(rv); -@@ -190,7 +202,8 @@ - PyErr_SetString(ImageopError, "Size should be 1 or 4"); - return 0; - } -- if ( maxx*maxy*width != len ) { -+ if ( ( maxx*maxy*width != len ) || -+ ( maxx != ((len / maxy) / width) ) ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; - } -@@ -240,7 +253,8 @@ - if ( !PyArg_ParseTuple(args, "s#iii", &cp, &len, &x, &y, &tres) ) - return 0; - -- if ( x*y != len ) { -+ if ( ( x*y != len ) || -+ ( x != len / y ) ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; - } -@@ -281,7 +295,8 @@ - if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) ) - return 0; - -- if ( x*y != len ) { -+ if ( ( x*y != len ) || -+ ( x != len / y ) ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; - } -@@ -320,7 +335,8 @@ - if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) ) - return 0; - -- if ( x*y != len ) { -+ if ( ( x*y != len ) || -+ ( x != len / y ) ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; - } -@@ -358,7 +374,8 @@ - if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) ) - return 0; - -- if ( x*y != len ) { -+ if ( ( x*y != len ) || -+ ( x != len / y ) ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; - } -@@ -404,7 +421,8 @@ - if ( !PyArg_ParseTuple(args, "s#ii", &cp, &len, &x, &y) ) - return 0; - -- if ( x*y != len ) { -+ if ( ( x*y != len ) || -+ ( x != len / y ) ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; - } -@@ -443,7 +461,11 @@ - if ( !PyArg_ParseTuple(args, "s#iiii", &cp, &len, &x, &y, &v0, &v1) ) - return 0; - -- nlen = x*y; -+ nlen = x*y; -+ if ( x != (nlen / y) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } - if ( (nlen+7)/8 != len ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; -@@ -481,6 +503,10 @@ - return 0; - - nlen = x*y; -+ if ( x != (nlen / y) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } - if ( (nlen+3)/4 != len ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; -@@ -517,6 +543,10 @@ - return 0; - - nlen = x*y; -+ if ( x != (nlen / y) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } - if ( (nlen+1)/2 != len ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; -@@ -554,6 +584,10 @@ - return 0; - - nlen = x*y; -+ if ( x != (nlen / y) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } - if ( nlen*4 != len ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; -@@ -598,6 +632,10 @@ - return 0; - - nlen = x*y; -+ if ( x != (nlen / y) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } - if ( nlen != len ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; -@@ -648,6 +686,10 @@ - return 0; - - nlen = x*y; -+ if ( x != (nlen / y) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } - if ( nlen*4 != len ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; -@@ -693,6 +735,10 @@ - return 0; - - nlen = x*y; -+ if ( x != (nlen / y) ) { -+ PyErr_SetString(ImageopError, "String has incorrect length"); -+ return 0; -+ } - if ( nlen != len ) { - PyErr_SetString(ImageopError, "String has incorrect length"); - return 0; -Index: python-2.5.2/Modules/rgbimgmodule.c -=================================================================== ---- python-2.5.2.orig/Modules/rgbimgmodule.c 2008-02-14 08:26:18.000000000 -0300 -+++ python-2.5.2/Modules/rgbimgmodule.c 2008-04-07 16:29:10.000000000 -0300 -@@ -299,6 +299,11 @@ - xsize = image.xsize; - ysize = image.ysize; - zsize = image.zsize; -+ tablen = xsize * ysize * zsize * sizeof(Py_Int32); -+ if (xsize != (((tablen / ysize) / zsize) / sizeof(Py_Int32))) { -+ PyErr_NoMemory(); -+ goto finally; -+ } - if (rle) { - tablen = ysize * zsize * sizeof(Py_Int32); - rlebuflen = (int) (1.05 * xsize +10); diff --git a/packages/python/python-2.5.2/autohell.patch b/packages/python/python-2.5.2/autohell.patch deleted file mode 100644 index 32977955d4..0000000000 --- a/packages/python/python-2.5.2/autohell.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 <stdio.h> --#include <stddef.h> --#include <string.h> -- --#ifdef HAVE_SYS_TYPES_H --#include <sys/types.h> --#endif -- --#ifdef HAVE_SSIZE_T --typedef ssize_t Py_ssize_t; --#elif SIZEOF_VOID_P == SIZEOF_LONG --typedef long Py_ssize_t; --#else --typedef int Py_ssize_t; --#endif -- --int main() --{ -- char buffer[256]; -- -- if(sprintf(buffer, "%zd", (size_t)123) < 0) -- return 1; -- -- if (strcmp(buffer, "123")) -- return 1; -- -- if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0) -- return 1; -- -- if (strcmp(buffer, "-123")) -- return 1; -- -- return 0; --}], --[AC_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.2/bindir-libdir.patch b/packages/python/python-2.5.2/bindir-libdir.patch deleted file mode 100644 index 047c358a55..0000000000 --- a/packages/python/python-2.5.2/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/packages/python/python-2.5.2/crosscompile.patch b/packages/python/python-2.5.2/crosscompile.patch deleted file mode 100644 index f1b1c6f3e0..0000000000 --- a/packages/python/python-2.5.2/crosscompile.patch +++ /dev/null @@ -1,110 +0,0 @@ -# -# Patch (C) by Michael 'Mickey' Lauer <mlauer@vanille-media.de> -# -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/packages/python/python-2.5.2/default-is-optimized.patch b/packages/python/python-2.5.2/default-is-optimized.patch deleted file mode 100644 index 072bf0b059..0000000000 --- a/packages/python/python-2.5.2/default-is-optimized.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: Python-2.5.2/Python/compile.c -=================================================================== ---- Python-2.5.2.orig/Python/compile.c -+++ Python-2.5.2/Python/compile.c -@@ -30,7 +30,7 @@ - #include "symtable.h" - #include "opcode.h" - --int Py_OptimizeFlag = 0; -+int Py_OptimizeFlag = 1; - - /* - ISSUES: -Index: Python-2.5.2/Modules/main.c -=================================================================== ---- Python-2.5.2.orig/Modules/main.c -+++ Python-2.5.2/Modules/main.c -@@ -40,7 +40,7 @@ static char **orig_argv; - static int orig_argc; - - /* command line options */ --#define BASE_OPTS "c:dEhim:OQ:StuUvVW:xX?" -+#define BASE_OPTS "c:dEhim:ONQ:StuUvVW:xX?" - - #ifndef RISCOS - #define PROGRAM_OPTS BASE_OPTS -@@ -68,8 +68,7 @@ Options and arguments (and corresponding - "; - static char *usage_2 = "\ - -m mod : run library module as a script (terminates option list)\n\ ---O : optimize generated bytecode (a tad; also PYTHONOPTIMIZE=x)\n\ ---OO : remove doc-strings in addition to the -O optimizations\n\ -+-N : do NOT optimize generated bytecode\n\ - -Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n\ - -S : don't imply 'import site' on initialization\n\ - -t : issue warnings about inconsistent tab usage (-tt: issue errors)\n\ -@@ -302,7 +301,10 @@ Py_Main(int argc, char **argv) - break; - - case 'O': -- Py_OptimizeFlag++; -+ fprintf(stderr, "-O is already default in this version. Ignoring\n"); -+ -+ case 'N': -+ Py_OptimizeFlag=0; - break; - - case 'S': diff --git a/packages/python/python-2.5.2/enable-ctypes-module.patch b/packages/python/python-2.5.2/enable-ctypes-module.patch deleted file mode 100644 index dd5adaf0e7..0000000000 --- a/packages/python/python-2.5.2/enable-ctypes-module.patch +++ /dev/null @@ -1,106 +0,0 @@ -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/packages/python/python-2.5.2/fix-tkinter-detection.patch b/packages/python/python-2.5.2/fix-tkinter-detection.patch deleted file mode 100644 index 93bd343381..0000000000 --- a/packages/python/python-2.5.2/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/packages/python/python-2.5.2/sitebranding.patch b/packages/python/python-2.5.2/sitebranding.patch deleted file mode 100644 index c6e486ae97..0000000000 --- a/packages/python/python-2.5.2/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/packages/python/python-2.5.2/sitecustomize.py b/packages/python/python-2.5.2/sitecustomize.py deleted file mode 100644 index 273901898a..0000000000 --- a/packages/python/python-2.5.2/sitecustomize.py +++ /dev/null @@ -1,45 +0,0 @@ -# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de> -# GPLv2 or later -# Version: 20081123 -# Features: -# * set proper default encoding -# * enable readline completion in the interactive interpreter -# * load command line history on startup -# * save command line history on exit - -import os - -def __exithandler(): - try: - readline.write_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) - except IOError: - pass - -def __registerExitHandler(): - import atexit - atexit.register( __exithandler ) - -def __enableReadlineSupport(): - readline.set_history_length( 1000 ) - readline.parse_and_bind( "tab: complete" ) - try: - readline.read_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) - except IOError: - pass - -def __enableDefaultEncoding(): - import sys - try: - sys.setdefaultencoding( "utf8" ) - except LookupError: - pass - -import sys -try: - import rlcompleter, readline -except ImportError: - pass -else: - __enableDefaultEncoding() - __registerExitHandler() - __enableReadlineSupport() diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb deleted file mode 100644 index 6be228ab86..0000000000 --- a/packages/python/python-native_2.5.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "The Python Programming Language" -HOMEPAGE = "http://www.python.org" -LICENSE = "PSF" -DEPENDS = "openssl-native bzip2-full-native zlib-native" -SECTION = "devel/python" -PRIORITY = "optional" -PR = "ml6" - -EXCLUDE_FROM_WORLD = "1" - -SRC_URI = "\ - http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://cross-distutils.patch;patch=1 \ - file://dont-modify-shebang-line.patch;patch=1 \ - file://default-is-optimized.patch;patch=1 \ - file://catchup-with-swig.patch;patch=1 \ - file://fix-staging.patch;patch=1 \ -" -S = "${WORKDIR}/Python-${PV}" - -inherit autotools native - -prefix = "${STAGING_DIR_NATIVE}/${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}" - -EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ - --without-cxx --with-signal-module --with-wctype-functions" -EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \ - STAGING_INCDIR=${STAGING_INCDIR_NATIVE}' - -do_stage_append() { - install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/ -} diff --git a/packages/python/python24-2.4.4/autohell.patch b/packages/python/python24-2.4.4/autohell.patch deleted file mode 100644 index b0eebb9ce8..0000000000 --- a/packages/python/python24-2.4.4/autohell.patch +++ /dev/null @@ -1,1209 +0,0 @@ ---- Python-2.3.3/acinclude.m4 1969-12-31 19:00:00.000000000 -0500 -+++ Python-2.3.3/acinclude.m4 2004-02-17 12:22:29.000000000 -0500 -@@ -0,0 +1,10 @@ -+dnl Autoconf 2.5x does not have AC_PROG_CXX_WORKS anymore -+dnl If this macro is not defined by Autoconf, define it here. -+ -+m4_ifdef([AC_PROG_CXX_WORKS], -+ [], -+ [m4_define([AC_PROG_CXX_WORKS], -+ [AC_LANG_PUSH(C++)dnl -+ _AC_COMPILER_EXEEXT -+ AC_LANG_POP()] -+ )]) ---- Python-2.3.3/configure.in 2003-11-18 14:59:39.000000000 -0500 -+++ Python-2.3.3/configure.in 2004-02-17 12:22:27.000000000 -0500 -@@ -4,8 +4,8 @@ - m4_define(PYTHON_VERSION, 2.3) - - AC_REVISION($Revision: 1.427.4.10 $) --AC_PREREQ(2.53) --AC_INIT(python, PYTHON_VERSION) -+AC_PREREQ(2.59) -+AC_INIT([python],[PYTHON_VERSION]) - AC_CONFIG_SRCDIR([Include/object.h]) - AC_CONFIG_HEADER(pyconfig.h) - -@@ -58,7 +58,7 @@ - - dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output - AC_ARG_ENABLE(framework, -- AC_HELP_STRING(--enable-framework@<:@=INSTALLDIR@:>@, Build (MacOSX|Darwin) framework), -+ AS_HELP_STRING(--enable-framework@<:@=INSTALLDIR@:>@,Build (MacOSX|Darwin) framework), - [ - case $enableval in - yes) -@@ -92,8 +92,7 @@ - AC_SUBST(PYTHONFRAMEWORKINSTALLDIR) - - ##AC_ARG_WITH(dyld, --## AC_HELP_STRING(--with-dyld, --## Use (OpenStep|Rhapsody) dynamic linker)) -+## AS_HELP_STRING(--with-dyld,## Use (OpenStep|Rhapsody) dynamic linker)) - ## - # Set name for machine-dependent library files - AC_SUBST(MACHDEP) -@@ -227,7 +226,7 @@ - # on that fiddles with OPT and BASECFLAGS? - AC_MSG_CHECKING(for --without-gcc) - AC_ARG_WITH(gcc, -- AC_HELP_STRING(--without-gcc,never use gcc), -+ AS_HELP_STRING(--without-gcc,never use gcc), - [ - case $withval in - no) CC=cc -@@ -273,7 +272,7 @@ - MAINOBJ=python.o - AC_MSG_CHECKING(for --with-cxx=<compiler>) - AC_ARG_WITH(cxx, -- AC_HELP_STRING(--with-cxx=<compiler>, enable C++ support), -+ AS_HELP_STRING(--with-cxx=<compiler>,enable C++ support), - [ - check_cxx=no - case $withval in -@@ -298,15 +297,6 @@ - dnl --without-cxx was given. - dnl Finally, it does not test whether CXX is g++. - --dnl Autoconf 2.5x does not have AC_PROG_CXX_WORKS anymore --ifdef([AC_PROG_CXX_WORKS],[], -- [AC_DEFUN([AC_PROG_CXX_WORKS], -- [AC_LANG_PUSH(C++)dnl -- _AC_COMPILER_EXEEXT -- AC_LANG_POP() -- ] --)]) -- - if test "$check_cxx" = "yes" - then - AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, notfound) -@@ -348,7 +338,7 @@ - AC_EXEEXT - AC_MSG_CHECKING(for --with-suffix) - AC_ARG_WITH(suffix, -- AC_HELP_STRING(--with-suffix=.exe, set executable suffix), -+ AS_HELP_STRING(--with-suffix=.exe,set executable suffix), - [ - case $withval in - no) EXEEXT=;; -@@ -474,7 +464,7 @@ - - AC_MSG_CHECKING(for --enable-shared) - AC_ARG_ENABLE(shared, -- AC_HELP_STRING(--enable-shared, disable/enable building shared python library)) -+ AS_HELP_STRING(--enable-shared,disable/enable building shared python library)) - - if test -z "$enable_shared" - then -@@ -583,7 +573,7 @@ - # Check for --with-pydebug - AC_MSG_CHECKING(for --with-pydebug) - AC_ARG_WITH(pydebug, -- AC_HELP_STRING(--with-pydebug, build with Py_DEBUG defined), -+ AS_HELP_STRING(--with-pydebug,build with Py_DEBUG defined), - [ - if test "$withval" != no - then -@@ -660,10 +650,7 @@ - AC_MSG_CHECKING(whether $CC accepts -fno-strict-aliasing) - ac_save_cc="$CC" - CC="$CC -fno-strict-aliasing" -- AC_TRY_RUN([int main() { return 0; }], -- ac_cv_no_strict_aliasing_ok=yes, -- ac_cv_no_strict_aliasing_ok=no, -- ac_cv_no_strict_aliasing_ok=no) -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],[ac_cv_no_strict_aliasing_ok=yes],[ac_cv_no_strict_aliasing_ok=no],[ac_cv_no_strict_aliasing_ok=no]) - CC="$ac_save_cc" - AC_MSG_RESULT($ac_cv_no_strict_aliasing_ok) - if test $ac_cv_no_strict_aliasing_ok = yes -@@ -711,10 +698,7 @@ - AC_CACHE_VAL(ac_cv_opt_olimit_ok, - [ac_save_cc="$CC" - CC="$CC -OPT:Olimit=0" --AC_TRY_RUN([int main() { return 0; }], -- ac_cv_opt_olimit_ok=yes, -- ac_cv_opt_olimit_ok=no, -- ac_cv_opt_olimit_ok=no) -+AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],[ac_cv_opt_olimit_ok=yes],[ac_cv_opt_olimit_ok=no],[ac_cv_opt_olimit_ok=no]) - CC="$ac_save_cc"]) - AC_MSG_RESULT($ac_cv_opt_olimit_ok) - if test $ac_cv_opt_olimit_ok = yes; then -@@ -733,10 +717,7 @@ - AC_CACHE_VAL(ac_cv_olimit_ok, - [ac_save_cc="$CC" - CC="$CC -Olimit 1500" -- AC_TRY_RUN([int main() { return 0; }], -- ac_cv_olimit_ok=yes, -- ac_cv_olimit_ok=no, -- ac_cv_olimit_ok=no) -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],[ac_cv_olimit_ok=yes],[ac_cv_olimit_ok=no],[ac_cv_olimit_ok=no]) - CC="$ac_save_cc"]) - AC_MSG_RESULT($ac_cv_olimit_ok) - if test $ac_cv_olimit_ok = yes; then -@@ -751,7 +732,7 @@ - # options before we can check whether -Kpthread improves anything. - AC_MSG_CHECKING(whether pthreads are available without options) - AC_CACHE_VAL(ac_cv_pthread_is_default, --[AC_TRY_RUN([ -+[AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <pthread.h> - - void* routine(void* p){return NULL;} -@@ -763,14 +744,11 @@ - (void)pthread_detach(p); - return 0; - } --], --[ -+]])],[ - ac_cv_pthread_is_default=yes - ac_cv_kthread=no - ac_cv_pthread=no --], -- ac_cv_pthread_is_default=no, -- ac_cv_pthread_is_default=no) -+],[ac_cv_pthread_is_default=no],[ac_cv_pthread_is_default=no]) - ]) - AC_MSG_RESULT($ac_cv_pthread_is_default) - -@@ -788,7 +766,7 @@ - AC_CACHE_VAL(ac_cv_kpthread, - [ac_save_cc="$CC" - CC="$CC -Kpthread" --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <pthread.h> - - void* routine(void* p){return NULL;} -@@ -800,10 +778,7 @@ - (void)pthread_detach(p); - return 0; - } --], -- ac_cv_kpthread=yes, -- ac_cv_kpthread=no, -- ac_cv_kpthread=no) -+]])],[ac_cv_kpthread=yes],[ac_cv_kpthread=no],[ac_cv_kpthread=no]) - CC="$ac_save_cc"]) - AC_MSG_RESULT($ac_cv_kpthread) - fi -@@ -819,7 +794,7 @@ - AC_CACHE_VAL(ac_cv_kthread, - [ac_save_cc="$CC" - CC="$CC -Kthread" --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <pthread.h> - - void* routine(void* p){return NULL;} -@@ -831,10 +806,7 @@ - (void)pthread_detach(p); - return 0; - } --], -- ac_cv_kthread=yes, -- ac_cv_kthread=no, -- ac_cv_kthread=no) -+]])],[ac_cv_kthread=yes],[ac_cv_kthread=no],[ac_cv_kthread=no]) - CC="$ac_save_cc"]) - AC_MSG_RESULT($ac_cv_kthread) - fi -@@ -850,7 +822,7 @@ - AC_CACHE_VAL(ac_cv_thread, - [ac_save_cc="$CC" - CC="$CC -pthread" --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <pthread.h> - - void* routine(void* p){return NULL;} -@@ -862,10 +834,7 @@ - (void)pthread_detach(p); - return 0; - } --], -- ac_cv_pthread=yes, -- ac_cv_pthread=no, -- ac_cv_pthread=no) -+]])],[ac_cv_pthread=yes],[ac_cv_pthread=no],[ac_cv_pthread=no]) - CC="$ac_save_cc"]) - AC_MSG_RESULT($ac_cv_pthread) - fi -@@ -911,11 +880,11 @@ - - dnl # check for ANSI or K&R ("traditional") preprocessor - dnl AC_MSG_CHECKING(for C preprocessor type) --dnl AC_TRY_COMPILE([ -+dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - dnl #define spam(name, doc) {#name, &name, #name "() -- " doc} - dnl int foo; - dnl struct {char *name; int *addr; char *doc;} desc = spam(foo, "something"); --dnl ], [;], cpp_type=ansi, AC_DEFINE(HAVE_OLD_CPP) cpp_type=traditional) -+dnl ]], [[;]])],[cpp_type=ansi],[AC_DEFINE(HAVE_OLD_CPP) cpp_type=traditional]) - dnl AC_MSG_RESULT($cpp_type) - - # checks for header files -@@ -941,19 +910,13 @@ - - # Check whether using makedev requires defining _OSF_SOURCE - AC_MSG_CHECKING(for makedev) --AC_TRY_LINK([#include <sys/types.h> ], -- [ makedev(0, 0) ], -- ac_cv_has_makedev=yes, -- ac_cv_has_makedev=no) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> ]], [[ makedev(0, 0) ]])],[ac_cv_has_makedev=yes],[ac_cv_has_makedev=no]) - if test "$ac_cv_has_makedev" = "no"; then - # we didn't link, try if _OSF_SOURCE will allow us to link -- AC_TRY_LINK([ -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #define _OSF_SOURCE 1 - #include <sys/types.h> -- ], -- [ makedev(0, 0) ], -- ac_cv_has_makedev=yes, -- ac_cv_has_makedev=no) -+ ]], [[ makedev(0, 0) ]])],[ac_cv_has_makedev=yes],[ac_cv_has_makedev=no]) - if test "$ac_cv_has_makedev" = "yes"; then - AC_DEFINE(_OSF_SOURCE, 1, [Define _OSF_SOURCE to get the makedev macro.]) - fi -@@ -972,11 +935,11 @@ - - use_lfs=yes - AC_MSG_CHECKING(Solaris LFS bug) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #define _LARGEFILE_SOURCE 1 - #define _FILE_OFFSET_BITS 64 - #include <sys/resource.h> --],struct rlimit foo;,sol_lfs_bug=no,sol_lfs_bug=yes) -+]], [[struct rlimit foo;]])],[sol_lfs_bug=no],[sol_lfs_bug=yes]) - AC_MSG_RESULT($sol_lfs_bug) - if test "$sol_lfs_bug" = "yes"; then - use_lfs=no -@@ -1018,10 +981,10 @@ - - AC_MSG_CHECKING(for long long support) - have_long_long=no --AC_TRY_COMPILE([], [long long x; x = (long long)0;], [ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[long long x; x = (long long)0;]])],[ - AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.]) - have_long_long=yes --]) -+],[]) - AC_MSG_RESULT($have_long_long) - if test "$have_long_long" = yes ; then - AC_CHECK_SIZEOF(long long, 8) -@@ -1029,10 +992,10 @@ - - AC_MSG_CHECKING(for uintptr_t support) - have_uintptr_t=no --AC_TRY_COMPILE([], [uintptr_t x; x = (uintptr_t)0;], [ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[uintptr_t x; x = (uintptr_t)0;]])],[ - AC_DEFINE(HAVE_UINTPTR_T, 1, [Define this if you have the type uintptr_t.]) - have_uintptr_t=yes --]) -+],[]) - AC_MSG_RESULT($have_uintptr_t) - if test "$have_uintptr_t" = yes ; then - AC_CHECK_SIZEOF(uintptr_t, 4) -@@ -1041,7 +1004,7 @@ - # Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>. - AC_MSG_CHECKING(size of off_t) - AC_CACHE_VAL(ac_cv_sizeof_off_t, --[AC_TRY_RUN([#include <stdio.h> -+[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h> - #include <sys/types.h> - main() - { -@@ -1049,10 +1012,7 @@ - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(off_t)); - exit(0); --}], --ac_cv_sizeof_off_t=`cat conftestval`, --ac_cv_sizeof_off_t=0, --ac_cv_sizeof_off_t=4) -+}]])],[ac_cv_sizeof_off_t=`cat conftestval`],[ac_cv_sizeof_off_t=0],[ac_cv_sizeof_off_t=4]) - ]) - AC_MSG_RESULT($ac_cv_sizeof_off_t) - AC_DEFINE_UNQUOTED(SIZEOF_OFF_T, $ac_cv_sizeof_off_t, -@@ -1075,7 +1035,7 @@ - # AC_CHECK_SIZEOF() doesn't include <time.h>. - AC_MSG_CHECKING(size of time_t) - AC_CACHE_VAL(ac_cv_sizeof_time_t, --[AC_TRY_RUN([#include <stdio.h> -+[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h> - #include <time.h> - main() - { -@@ -1083,10 +1043,7 @@ - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(time_t)); - exit(0); --}], --ac_cv_sizeof_time_t=`cat conftestval`, --ac_cv_sizeof_time_t=0, --ac_cv_sizeof_time_t=4) -+}]])],[ac_cv_sizeof_time_t=`cat conftestval`],[ac_cv_sizeof_time_t=0],[ac_cv_sizeof_time_t=4]) - ]) - AC_MSG_RESULT($ac_cv_sizeof_time_t) - AC_DEFINE_UNQUOTED(SIZEOF_TIME_T, $ac_cv_sizeof_time_t, -@@ -1104,13 +1061,13 @@ - fi - AC_MSG_CHECKING(for pthread_t) - have_pthread_t=no --AC_TRY_COMPILE([#include <pthread.h>], [pthread_t x; x = *(pthread_t*)0;], have_pthread_t=yes) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t x; x = *(pthread_t*)0;]])],[have_pthread_t=yes],[]) - AC_MSG_RESULT($have_pthread_t) - if test "$have_pthread_t" = yes ; then - # AC_CHECK_SIZEOF() doesn't include <pthread.h>. - AC_MSG_CHECKING(size of pthread_t) - AC_CACHE_VAL(ac_cv_sizeof_pthread_t, -- [AC_TRY_RUN([#include <stdio.h> -+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h> - #include <pthread.h> - main() - { -@@ -1118,10 +1075,7 @@ - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(pthread_t)); - exit(0); -- }], -- ac_cv_sizeof_pthread_t=`cat conftestval`, -- ac_cv_sizeof_pthread_t=0, -- ac_cv_sizeof_pthread_t=4) -+ }]])],[ac_cv_sizeof_pthread_t=`cat conftestval`],[ac_cv_sizeof_pthread_t=0],[ac_cv_sizeof_pthread_t=4]) - ]) - AC_MSG_RESULT($ac_cv_sizeof_pthread_t) - AC_DEFINE_UNQUOTED(SIZEOF_PTHREAD_T, $ac_cv_sizeof_pthread_t, -@@ -1131,7 +1085,7 @@ - - AC_MSG_CHECKING(for --enable-toolbox-glue) - AC_ARG_ENABLE(toolbox-glue, -- AC_HELP_STRING(--enable-toolbox-glue, disable/enable MacOSX glue code for extensions)) -+ AS_HELP_STRING(--enable-toolbox-glue,disable/enable MacOSX glue code for extensions)) - - if test -z "$enable_toolbox_glue" - then -@@ -1436,13 +1390,10 @@ - # checks for system dependent C++ extensions support - case "$ac_sys_system" in - AIX*) AC_MSG_CHECKING(for genuine AIX C++ extensions support) -- AC_TRY_LINK([#include "/usr/lpp/xlC/include/load.h"], -- [loadAndInit("", 0, "")], -- [AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1, -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "/usr/lpp/xlC/include/load.h"]], [[loadAndInit("", 0, "")]])],[AC_DEFINE(AIX_GENUINE_CPLUSPLUS, 1, - [Define for AIX if your compiler is a genuine IBM xlC/xlC_r - and you want support for AIX C++ shared extension modules.]) -- AC_MSG_RESULT(yes)], -- [AC_MSG_RESULT(no)]);; -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]);; - *) ;; - esac - -@@ -1464,7 +1415,7 @@ - - AC_MSG_CHECKING(for --with-libs) - AC_ARG_WITH(libs, -- AC_HELP_STRING(--with-libs='lib1 ...', link against additional libs), -+ AS_HELP_STRING(--with-libs='lib1 ...',link against additional libs), - [ - AC_MSG_RESULT($withval) - LIBS="$withval $LIBS" -@@ -1476,7 +1427,7 @@ - AC_SUBST(SIGNAL_OBJS) - AC_MSG_CHECKING(for --with-signal-module) - AC_ARG_WITH(signal-module, -- AC_HELP_STRING(--with-signal-module, disable/enable signal module)) -+ AS_HELP_STRING(--with-signal-module,disable/enable signal module)) - - if test -z "$with_signal_module" - then with_signal_module="yes" -@@ -1498,7 +1449,7 @@ - AC_MSG_CHECKING(for --with-dec-threads) - AC_SUBST(LDLAST) - AC_ARG_WITH(dec-threads, -- AC_HELP_STRING(--with-dec-threads, use DEC Alpha/OSF1 thread-safe libraries), -+ AS_HELP_STRING(--with-dec-threads,use DEC Alpha/OSF1 thread-safe libraries), - [ - AC_MSG_RESULT($withval) - LDLAST=-threads -@@ -1518,12 +1469,12 @@ - AC_MSG_CHECKING(for --with-threads) - dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output - AC_ARG_WITH(threads, -- AC_HELP_STRING(--with(out)-threads@<:@=DIRECTORY@:>@, disable/enable thread support)) -+ AS_HELP_STRING(--with(out)-threads@<:@=DIRECTORY@:>@,disable/enable thread support)) - - # --with-thread is deprecated, but check for it anyway - dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output - AC_ARG_WITH(thread, -- AC_HELP_STRING(--with(out)-thread@<:@=DIRECTORY@:>@, deprecated; use --with(out)-threads), -+ AS_HELP_STRING(--with(out)-thread@<:@=DIRECTORY@:>@,deprecated; use --with(out)-threads), - [with_threads=$with_thread]) - - if test -z "$with_threads" -@@ -1603,7 +1554,7 @@ - THREADOBJ="Python/thread.o"],[ - AC_MSG_CHECKING(for --with-pth) - AC_ARG_WITH([pth], -- AC_HELP_STRING(--with-pth, use GNU pth threading libraries), -+ AS_HELP_STRING(--with-pth,use GNU pth threading libraries), - [AC_MSG_RESULT($withval) - AC_DEFINE([WITH_THREAD]) - AC_DEFINE([HAVE_PTH], 1, -@@ -1618,10 +1569,10 @@ - _libs=$LIBS - LIBS="$LIBS -lpthread" - AC_MSG_CHECKING([for pthread_create in -lpthread]) -- AC_TRY_LINK([#include <pthread.h> -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h> - --void * start_routine (void *arg) { exit (0); }], [ --pthread_create (NULL, NULL, start_routine, NULL)], [ -+void * start_routine (void *arg) { exit (0); }]], [[ -+pthread_create (NULL, NULL, start_routine, NULL)]])],[ - AC_MSG_RESULT(yes) - AC_DEFINE(WITH_THREAD) - posix_threads=yes -@@ -1705,7 +1656,7 @@ - - AC_MSG_CHECKING(if PTHREAD_SCOPE_SYSTEM is supported) - AC_CACHE_VAL(ac_cv_pthread_system_supported, -- [AC_TRY_RUN([#include <pthread.h> -+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <pthread.h> - void *foo(void *parm) { - return NULL; - } -@@ -1716,10 +1667,7 @@ - if (pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM)) exit(-1); - if (pthread_create(&id, &attr, foo, NULL)) exit(-1); - exit(0); -- }], -- ac_cv_pthread_system_supported=yes, -- ac_cv_pthread_system_supported=no, -- ac_cv_pthread_system_supported=no) -+ }]])],[ac_cv_pthread_system_supported=yes],[ac_cv_pthread_system_supported=no],[ac_cv_pthread_system_supported=no]) - ]) - AC_MSG_RESULT($ac_cv_pthread_system_supported) - if test "$ac_cv_pthread_system_supported" = "yes"; then -@@ -1754,7 +1702,7 @@ - - [ - dnl the check does not work on cross compilation case... -- AC_TRY_RUN([ /* AF_INET6 available check */ -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* AF_INET6 available check */ - #include <sys/types.h> - #include <sys/socket.h> - main() -@@ -1764,25 +1712,19 @@ - else - exit(0); - } --], -- AC_MSG_RESULT(yes) -- ipv6=yes, -- AC_MSG_RESULT(no) -- ipv6=no, -- AC_MSG_RESULT(no) -+]])],[AC_MSG_RESULT(yes) -+ ipv6=yes],[AC_MSG_RESULT(no) -+ ipv6=no],[AC_MSG_RESULT(no) - ipv6=no --) -+]) - - if test "$ipv6" = "yes"; then - AC_MSG_CHECKING(if RFC2553 API is available) -- AC_TRY_COMPILE([#include <sys/types.h> --#include <netinet/in.h>], -- [struct sockaddr_in6 x; --x.sin6_scope_id;], -- AC_MSG_RESULT(yes) -- ipv6=yes, -- AC_MSG_RESULT(no, IPv6 disabled) -- ipv6=no) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> -+#include <netinet/in.h>]], [[struct sockaddr_in6 x; -+x.sin6_scope_id;]])],[AC_MSG_RESULT(yes) -+ ipv6=yes],[AC_MSG_RESULT(no, IPv6 disabled) -+ ipv6=no]) - fi - - if test "$ipv6" = "yes"; then -@@ -1905,7 +1847,7 @@ - # Check for universal newline support - AC_MSG_CHECKING(for --with-universal-newlines) - AC_ARG_WITH(universal-newlines, -- AC_HELP_STRING(--with(out)-universal-newlines, disable/enable foreign newlines)) -+ AS_HELP_STRING(--with(out)-universal-newlines,disable/enable foreign newlines)) - - if test -z "$with_universal_newlines" - then with_universal_newlines="yes" -@@ -1923,7 +1865,7 @@ - # Check for --with-doc-strings - AC_MSG_CHECKING(for --with-doc-strings) - AC_ARG_WITH(doc-strings, -- AC_HELP_STRING(--with(out)-doc-strings, disable/enable documentation strings)) -+ AS_HELP_STRING(--with(out)-doc-strings,disable/enable documentation strings)) - - if test -z "$with_doc_strings" - then with_doc_strings="yes" -@@ -1938,7 +1880,7 @@ - # Check for Python-specific malloc support - AC_MSG_CHECKING(for --with-pymalloc) - AC_ARG_WITH(pymalloc, -- AC_HELP_STRING(--with(out)-pymalloc, disable/enable specialized mallocs)) -+ AS_HELP_STRING(--with(out)-pymalloc,disable/enable specialized mallocs)) - - if test -z "$with_pymalloc" - then with_pymalloc="yes" -@@ -1953,7 +1895,7 @@ - # Check for --with-wctype-functions - AC_MSG_CHECKING(for --with-wctype-functions) - AC_ARG_WITH(wctype-functions, -- AC_HELP_STRING(--with-wctype-functions, use wctype.h functions), -+ AS_HELP_STRING(--with-wctype-functions,use wctype.h functions), - [ - if test "$withval" != no - then -@@ -1971,7 +1913,7 @@ - - AC_MSG_CHECKING(for --with-sgi-dl) - AC_ARG_WITH(sgi-dl, -- AC_HELP_STRING(--with-sgi-dl=DIRECTORY, IRIX 4 dynamic linking), -+ AS_HELP_STRING(--with-sgi-dl=DIRECTORY,IRIX 4 dynamic linking), - [ - AC_MSG_RESULT($withval) - echo --with-sgi-dl is unsupported, see README -@@ -1993,7 +1935,7 @@ - - AC_MSG_CHECKING(for --with-dl-dld) - AC_ARG_WITH(dl-dld, -- AC_HELP_STRING(--with-dl-dld=DL_DIR, GNU dynamic linking), -+ AS_HELP_STRING(--with-dl-dld=DL_DIR,GNU dynamic linking), - [ - AC_MSG_RESULT($withval) - echo --with-dl-dld is unsupported, see README -@@ -2085,41 +2027,29 @@ - # For some functions, having a definition is not sufficient, since - # we want to take their address. - AC_MSG_CHECKING(for chroot) --AC_TRY_COMPILE([#include <unistd.h>], void *x=chroot, -- AC_DEFINE(HAVE_CHROOT, 1, Define if you have the 'chroot' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=chroot]])],[AC_DEFINE(HAVE_CHROOT, 1, Define if you have the 'chroot' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - AC_MSG_CHECKING(for link) --AC_TRY_COMPILE([#include <unistd.h>], void *x=link, -- AC_DEFINE(HAVE_LINK, 1, Define if you have the 'link' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=link]])],[AC_DEFINE(HAVE_LINK, 1, Define if you have the 'link' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - AC_MSG_CHECKING(for symlink) --AC_TRY_COMPILE([#include <unistd.h>], void *x=symlink, -- AC_DEFINE(HAVE_SYMLINK, 1, Define if you have the 'symlink' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=symlink]])],[AC_DEFINE(HAVE_SYMLINK, 1, Define if you have the 'symlink' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - AC_MSG_CHECKING(for fchdir) --AC_TRY_COMPILE([#include <unistd.h>], void *x=fchdir, -- AC_DEFINE(HAVE_FCHDIR, 1, Define if you have the 'fchdir' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=fchdir]])],[AC_DEFINE(HAVE_FCHDIR, 1, Define if you have the 'fchdir' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - AC_MSG_CHECKING(for fsync) --AC_TRY_COMPILE([#include <unistd.h>], void *x=fsync, -- AC_DEFINE(HAVE_FSYNC, 1, Define if you have the 'fsync' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=fsync]])],[AC_DEFINE(HAVE_FSYNC, 1, Define if you have the 'fsync' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - AC_MSG_CHECKING(for fdatasync) --AC_TRY_COMPILE([#include <unistd.h>], void *x=fdatasync, -- AC_DEFINE(HAVE_FDATASYNC, 1, Define if you have the 'fdatasync' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[void *x=fdatasync]])],[AC_DEFINE(HAVE_FDATASYNC, 1, Define if you have the 'fdatasync' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - - # On some systems (eg. FreeBSD 5), we would find a definition of the - # functions ctermid_r, setgroups in the library, but no prototype -@@ -2128,34 +2058,28 @@ - # because of the missing prototypes. - - AC_MSG_CHECKING(for ctermid_r) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include "confdefs.h" - #include <stdio.h> --], void* p = ctermid_r, -- AC_DEFINE(HAVE_CTERMID_R, 1, Define if you have the 'ctermid_r' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+]], [[void* p = ctermid_r]])],[AC_DEFINE(HAVE_CTERMID_R, 1, Define if you have the 'ctermid_r' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - - AC_MSG_CHECKING(for flock) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include "confdefs.h" - #include <sys/file.h> --], void* p = flock, -- AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+]], [[void* p = flock]])],[AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - - AC_MSG_CHECKING(for getpagesize) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include "confdefs.h" - #include <unistd.h> --], void* p = getpagesize, -- AC_DEFINE(HAVE_GETPAGESIZE, 1, Define if you have the 'getpagesize' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+]], [[void* p = getpagesize]])],[AC_DEFINE(HAVE_GETPAGESIZE, 1, Define if you have the 'getpagesize' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - - dnl check for true - AC_CHECK_PROGS(TRUE, true, /bin/true) -@@ -2167,54 +2091,45 @@ - ) - - AC_MSG_CHECKING(for hstrerror) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include "confdefs.h" - #include <netdb.h> --], void* p = hstrerror; hstrerror(0), -- AC_DEFINE(HAVE_HSTRERROR, 1, Define if you have the 'hstrerror' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+]], [[void* p = hstrerror; hstrerror(0)]])],[AC_DEFINE(HAVE_HSTRERROR, 1, Define if you have the 'hstrerror' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - - AC_MSG_CHECKING(for inet_aton) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include "confdefs.h" - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> --], void* p = inet_aton;inet_aton(0,0), -- AC_DEFINE(HAVE_INET_ATON, 1, Define if you have the 'inet_aton' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+]], [[void* p = inet_aton;inet_aton(0,0)]])],[AC_DEFINE(HAVE_INET_ATON, 1, Define if you have the 'inet_aton' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - - AC_MSG_CHECKING(for inet_pton) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include "confdefs.h" - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> --], void* p = inet_pton, -- AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+]], [[void* p = inet_pton]])],[AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - - # On some systems, setgroups is in unistd.h, on others, in grp.h - AC_MSG_CHECKING(for setgroups) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include "confdefs.h" - #include <unistd.h> - #ifdef HAVE_GRP_H - #include <grp.h> - #endif --], --void* p = setgroups, -- AC_DEFINE(HAVE_SETGROUPS, 1, Define if you have the 'setgroups' function.) -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) --) -+]], [[void* p = setgroups]])],[AC_DEFINE(HAVE_SETGROUPS, 1, Define if you have the 'setgroups' function.) -+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) -+]) - - # check for openpty and forkpty - -@@ -2226,30 +2141,24 @@ - - AC_REPLACE_FUNCS(dup2 getcwd strdup strerror memmove) - AC_CHECK_FUNCS(getpgrp, -- AC_TRY_COMPILE([#include <unistd.h>], -- [getpgrp(0);], -- AC_DEFINE(GETPGRP_HAVE_ARG, 1, -- [Define if getpgrp() must be called as getpgrp(0).]) -- ) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[getpgrp(0);]])],[AC_DEFINE(GETPGRP_HAVE_ARG, 1, -+ Define if getpgrp() must be called as getpgrp(0).) -+ ],[]) - ) - AC_CHECK_FUNCS(setpgrp, -- AC_TRY_COMPILE([#include <unistd.h>], -- [setpgrp(0,0);], -- AC_DEFINE(SETPGRP_HAVE_ARG, 1, -- [Define if setpgrp() must be called as setpgrp(0, 0).]) -- ) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[setpgrp(0,0);]])],[AC_DEFINE(SETPGRP_HAVE_ARG, 1, -+ Define if setpgrp() must be called as setpgrp(0, 0).) -+ ],[]) - ) - AC_CHECK_FUNCS(gettimeofday, -- AC_TRY_COMPILE([#include <sys/time.h>], -- [gettimeofday((struct timeval*)0,(struct timezone*)0);], , -- AC_DEFINE(GETTIMEOFDAY_NO_TZ, 1, -- [Define if gettimeofday() does not have second (timezone) argument -- This is the case on Motorola V4 (R40V4.2)]) -- ) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/time.h>]], [[gettimeofday((struct timeval*)0,(struct timezone*)0);]])],[],[AC_DEFINE(GETTIMEOFDAY_NO_TZ, 1, -+ Define if gettimeofday() does not have second (timezone) argument -+ This is the case on Motorola V4 (R40V4.2)) -+ ]) - ) - - AC_MSG_CHECKING(for major, minor, and makedev) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #if defined(MAJOR_IN_MKDEV) - #include <sys/mkdev.h> - #elif defined(MAJOR_IN_SYSMACROS) -@@ -2257,9 +2166,9 @@ - #else - #include <sys/types.h> - #endif --],[ -+]], [[ - makedev(major(0),minor(0)); --],[ -+]])],[ - AC_DEFINE(HAVE_DEVICE_MACROS, 1, - [Define to 1 if you have the device macros.]) - AC_MSG_RESULT(yes) -@@ -2270,14 +2179,14 @@ - # On OSF/1 V5.1, getaddrinfo is available, but a define - # for [no]getaddrinfo in netdb.h. - AC_MSG_CHECKING(for getaddrinfo) --AC_TRY_LINK([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include <sys/types.h> - #include <sys/socket.h> - #include <netdb.h> - #include <stdio.h> --],[ -+]], [[ - getaddrinfo(NULL, NULL, NULL, NULL); --], [ -+]])],[ - AC_MSG_RESULT(yes) - AC_MSG_CHECKING(getaddrinfo bug) - AC_TRY_RUN([ -@@ -2371,7 +2280,7 @@ - AC_MSG_RESULT(buggy) - buggygetaddrinfo=yes, - AC_MSG_RESULT(buggy) --buggygetaddrinfo=yes)], [ -+buggygetaddrinfo=yes)],[ - AC_MSG_RESULT(no) - buggygetaddrinfo=yes - ]) -@@ -2397,9 +2306,7 @@ - - AC_MSG_CHECKING(for time.h that defines altzone) - AC_CACHE_VAL(ac_cv_header_time_altzone, --[AC_TRY_COMPILE([#include <time.h>], [return altzone;], -- ac_cv_header_time_altzone=yes, -- ac_cv_header_time_altzone=no)]) -+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[return altzone;]])],[ac_cv_header_time_altzone=yes],[ac_cv_header_time_altzone=no])]) - AC_MSG_RESULT($ac_cv_header_time_altzone) - if test $ac_cv_header_time_altzone = yes; then - AC_DEFINE(HAVE_ALTZONE, 1, [Define this if your time.h defines altzone.]) -@@ -2407,25 +2314,22 @@ - - was_it_defined=no - AC_MSG_CHECKING(whether sys/select.h and sys/time.h may both be included) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <sys/types.h> - #include <sys/select.h> - #include <sys/time.h> --], [;], [ -+]], [[;]])],[ - AC_DEFINE(SYS_SELECT_WITH_SYS_TIME, 1, - [Define if you can safely include both <sys/select.h> and <sys/time.h> - (which you can't on SCO ODT 3.0).]) - was_it_defined=yes --]) -+],[]) - AC_MSG_RESULT($was_it_defined) - - AC_MSG_CHECKING(for addrinfo) - AC_CACHE_VAL(ac_cv_struct_addrinfo, --AC_TRY_COMPILE([ --# include <netdb.h>], -- [struct addrinfo a], -- ac_cv_struct_addrinfo=yes, -- ac_cv_struct_addrinfo=no)) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+# include <netdb.h>]], [[struct addrinfo a]])],[ac_cv_struct_addrinfo=yes],[ac_cv_struct_addrinfo=no])) - AC_MSG_RESULT($ac_cv_struct_addrinfo) - if test $ac_cv_struct_addrinfo = yes; then - AC_DEFINE(HAVE_ADDRINFO, 1, [struct addrinfo (netdb.h)]) -@@ -2433,12 +2337,9 @@ - - AC_MSG_CHECKING(for sockaddr_storage) - AC_CACHE_VAL(ac_cv_struct_sockaddr_storage, --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - # include <sys/types.h> --# include <sys/socket.h>], -- [struct sockaddr_storage s], -- ac_cv_struct_sockaddr_storage=yes, -- ac_cv_struct_sockaddr_storage=no)) -+# include <sys/socket.h>]], [[struct sockaddr_storage s]])],[ac_cv_struct_sockaddr_storage=yes],[ac_cv_struct_sockaddr_storage=no])) - AC_MSG_RESULT($ac_cv_struct_sockaddr_storage) - if test $ac_cv_struct_sockaddr_storage = yes; then - AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [struct sockaddr_storage (sys/socket.h)]) -@@ -2451,30 +2352,28 @@ - - works=no - AC_MSG_CHECKING(for working volatile) --AC_TRY_COMPILE([],[volatile int x; x = 0;], works=yes, -- AC_DEFINE(volatile, [], [Define to empty if the keyword does not work.]) --) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[volatile int x; x = 0;]])],[works=yes],[AC_DEFINE(volatile, , Define to empty if the keyword does not work.) -+]) - AC_MSG_RESULT($works) - - works=no - AC_MSG_CHECKING(for working signed char) --AC_TRY_COMPILE([], [signed char c;], works=yes, -- AC_DEFINE(signed, [], [Define to empty if the keyword does not work.]) --) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char c;]])],[works=yes],[AC_DEFINE(signed, , Define to empty if the keyword does not work.) -+]) - AC_MSG_RESULT($works) - - have_prototypes=no - AC_MSG_CHECKING(for prototypes) --AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],[ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int foo(int x) { return 0; }]], [[return foo(10);]])],[ - AC_DEFINE(HAVE_PROTOTYPES, 1, - [Define if your compiler supports function prototype]) - have_prototypes=yes --]) -+],[]) - AC_MSG_RESULT($have_prototypes) - - works=no - AC_MSG_CHECKING(for variable length prototypes and stdarg.h) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <stdarg.h> - int foo(int x, ...) { - va_list va; -@@ -2484,45 +2383,41 @@ - va_arg(va, double); - return 0; - } --], [return foo(10, "", 3.14);], [ -+]], [[return foo(10, "", 3.14);]])],[ - AC_DEFINE(HAVE_STDARG_PROTOTYPES, 1, - [Define if your compiler supports variable length function prototypes - (e.g. void fprintf(FILE *, char *, ...);) *and* <stdarg.h>]) - works=yes --]) -+],[]) - AC_MSG_RESULT($works) - - if test "$have_prototypes" = yes; then - bad_prototypes=no - AC_MSG_CHECKING(for bad exec* prototypes) --AC_TRY_COMPILE([#include <unistd.h>], [char **t;execve("@",t,t);], , -- AC_DEFINE(BAD_EXEC_PROTOTYPES, 1, -- [Define if your <unistd.h> contains bad prototypes for exec*() -- (as it does on SGI IRIX 4.x)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[char **t;execve("@",t,t);]])],[],[AC_DEFINE(BAD_EXEC_PROTOTYPES, 1, -+ Define if your <unistd.h> contains bad prototypes for exec*() -+ (as it does on SGI IRIX 4.x)) - bad_prototypes=yes --) -+]) - AC_MSG_RESULT($bad_prototypes) - fi - - # check if sockaddr has sa_len member - AC_MSG_CHECKING(if sockaddr has sa_len member) --AC_TRY_COMPILE([#include <sys/types.h> --#include <sys/socket.h>], --[struct sockaddr x; --x.sa_len = 0;], -- AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Define if sockaddr has sa_len member]), -- AC_MSG_RESULT(no)) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h> -+#include <sys/socket.h>]], [[struct sockaddr x; -+x.sa_len = 0;]])],[AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, Define if sockaddr has sa_len member)],[AC_MSG_RESULT(no)]) - - va_list_is_array=no - AC_MSG_CHECKING(whether va_list is an array) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #ifdef HAVE_STDARG_PROTOTYPES - #include <stdarg.h> - #else - #include <varargs.h> - #endif --], [va_list list1, list2; list1 = list2;], , [ -+]], [[va_list list1, list2; list1 = list2;]])],[],[ - AC_DEFINE(VA_LIST_IS_ARRAY, 1, [Define if a va_list is an array of some kind]) - va_list_is_array=yes - ]) -@@ -2537,9 +2432,9 @@ - AC_MSG_CHECKING([gethostbyname_r with 6 args]) - OLD_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $MY_CPPFLAGS $MY_THREAD_CPPFLAGS $MY_CFLAGS" -- AC_TRY_COMPILE([ -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - # include <netdb.h> -- ], [ -+ ]], [[ - char *name; - struct hostent *he, *res; - char buffer[2048]; -@@ -2547,12 +2442,12 @@ - int h_errnop; - - (void) gethostbyname_r(name, he, buffer, buflen, &res, &h_errnop) -- ], [ -+ ]])],[ - AC_DEFINE(HAVE_GETHOSTBYNAME_R) - AC_DEFINE(HAVE_GETHOSTBYNAME_R_6_ARG, 1, - [Define this if you have the 6-arg version of gethostbyname_r().]) - AC_MSG_RESULT(yes) -- ], [ -+ ],[ - AC_MSG_RESULT(no) - AC_MSG_CHECKING([gethostbyname_r with 5 args]) - AC_TRY_COMPILE([ -@@ -2613,7 +2508,7 @@ - # Check for --with-fpectl - AC_MSG_CHECKING(for --with-fpectl) - AC_ARG_WITH(fpectl, -- AC_HELP_STRING(--with-fpectl, enable SIGFPE catching), -+ AS_HELP_STRING(--with-fpectl,enable SIGFPE catching), - [ - if test "$withval" != no - then -@@ -2633,7 +2528,7 @@ - esac - AC_MSG_CHECKING(for --with-libm=STRING) - AC_ARG_WITH(libm, -- AC_HELP_STRING(--with-libm=STRING, math library), -+ AS_HELP_STRING(--with-libm=STRING,math library), - [ - if test "$withval" = no - then LIBM= -@@ -2649,7 +2544,7 @@ - AC_SUBST(LIBC) - AC_MSG_CHECKING(for --with-libc=STRING) - AC_ARG_WITH(libc, -- AC_HELP_STRING(--with-libc=STRING, C library), -+ AS_HELP_STRING(--with-libc=STRING,C library), - [ - if test "$withval" = no - then LIBC= -@@ -2684,20 +2579,20 @@ - - AC_MSG_CHECKING(for UCS-4 tcl) - have_ucs4_tcl=no --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <tcl.h> - #if TCL_UTF_MAX != 6 - # error "NOT UCS4_TCL" --#endif], [], [ -+#endif]], [[]])],[ - AC_DEFINE(HAVE_UCS4_TCL, 1, [Define this if you have tcl and TCL_UTF_MAX==6]) - have_ucs4_tcl=yes --]) -+],[]) - AC_MSG_RESULT($have_ucs4_tcl) - - AC_MSG_CHECKING(what type to use for unicode) - dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output - AC_ARG_ENABLE(unicode, -- AC_HELP_STRING(--enable-unicode@<:@=ucs@<:@24@:>@@:>@, Enable Unicode strings (default is yes)), -+ AS_HELP_STRING(--enable-unicode@<:@=ucs@<:@24@:>@@:>@,Enable Unicode strings (default is yes)), - [], - [enable_unicode=yes]) - -@@ -2764,15 +2659,12 @@ - # or fills with zeros (like the Cray J90, according to Tim Peters). - AC_MSG_CHECKING(whether right shift extends the sign bit) - AC_CACHE_VAL(ac_cv_rshift_extends_sign, [ --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - int main() - { - exit(((-1)>>3 == -1) ? 0 : 1); - } --], --ac_cv_rshift_extends_sign=yes, --ac_cv_rshift_extends_sign=no, --ac_cv_rshift_extends_sign=yes)]) -+]])],[ac_cv_rshift_extends_sign=yes],[ac_cv_rshift_extends_sign=no],[ac_cv_rshift_extends_sign=yes])]) - AC_MSG_RESULT($ac_cv_rshift_extends_sign) - if test "$ac_cv_rshift_extends_sign" = no - then -@@ -2784,12 +2676,12 @@ - # check for getc_unlocked and related locking functions - AC_MSG_CHECKING(for getc_unlocked() and friends) - AC_CACHE_VAL(ac_cv_have_getc_unlocked, [ --AC_TRY_LINK([#include <stdio.h>],[ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[ - FILE *f = fopen("/dev/null", "r"); - flockfile(f); - getc_unlocked(f); - funlockfile(f); --], ac_cv_have_getc_unlocked=yes, ac_cv_have_getc_unlocked=no)]) -+]])],[ac_cv_have_getc_unlocked=yes],[ac_cv_have_getc_unlocked=no])]) - AC_MSG_RESULT($ac_cv_have_getc_unlocked) - if test "$ac_cv_have_getc_unlocked" = yes - then -@@ -2798,8 +2690,7 @@ - fi - - # check for readline 2.2 --AC_TRY_CPP([#include <readline/readline.h>], --have_readline=yes, have_readline=no) -+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <readline/readline.h>]])],[have_readline=yes],[have_readline=no]) - if test $have_readline = yes - then - AC_EGREP_HEADER([extern int rl_completion_append_character;], -@@ -2820,7 +2711,7 @@ - - AC_MSG_CHECKING(for broken nice()) - AC_CACHE_VAL(ac_cv_broken_nice, [ --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - int main() - { - int val1 = nice(1); -@@ -2828,10 +2719,7 @@ - exit(0); - exit(1); - } --], --ac_cv_broken_nice=yes, --ac_cv_broken_nice=no, --ac_cv_broken_nice=no)]) -+]])],[ac_cv_broken_nice=yes],[ac_cv_broken_nice=no],[ac_cv_broken_nice=no])]) - AC_MSG_RESULT($ac_cv_broken_nice) - if test "$ac_cv_broken_nice" = yes - then -@@ -2842,7 +2730,7 @@ - # tzset(3) exists and works like we expect it to - AC_MSG_CHECKING(for working tzset()) - AC_CACHE_VAL(ac_cv_working_tzset, [ --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <stdlib.h> - #include <time.h> - #include <string.h> -@@ -2880,10 +2768,7 @@ - - exit(0); - } --], --ac_cv_working_tzset=yes, --ac_cv_working_tzset=no, --ac_cv_working_tzset=no)]) -+]])],[ac_cv_working_tzset=yes],[ac_cv_working_tzset=no],[ac_cv_working_tzset=no])]) - AC_MSG_RESULT($ac_cv_working_tzset) - if test "$ac_cv_working_tzset" = yes - then -@@ -2894,13 +2779,10 @@ - # Look for subsecond timestamps in struct stat - AC_MSG_CHECKING(for tv_nsec in struct stat) - AC_CACHE_VAL(ac_cv_stat_tv_nsec, --AC_TRY_COMPILE([#include <sys/stat.h>], [ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[ - struct stat st; - st.st_mtim.tv_nsec = 1; --], --ac_cv_stat_tv_nsec=yes, --ac_cv_stat_tv_nsec=no, --ac_cv_stat_tv_nsec=no)) -+]])],[ac_cv_stat_tv_nsec=yes],[ac_cv_stat_tv_nsec=no])) - AC_MSG_RESULT($ac_cv_stat_tv_nsec) - if test "$ac_cv_stat_tv_nsec" = yes - then -@@ -2911,12 +2793,10 @@ - # On HP/UX 11.0, mvwdelch is a block with a return statement - AC_MSG_CHECKING(whether mvwdelch is an expression) - AC_CACHE_VAL(ac_cv_mvwdelch_is_expression, --AC_TRY_COMPILE([#include <curses.h>], [ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[ - int rtn; - rtn = mvwdelch(0,0,0); --], ac_cv_mvwdelch_is_expression=yes, -- ac_cv_mvwdelch_is_expression=no, -- ac_cv_mvwdelch_is_expression=yes)) -+]])],[ac_cv_mvwdelch_is_expression=yes],[ac_cv_mvwdelch_is_expression=no])) - AC_MSG_RESULT($ac_cv_mvwdelch_is_expression) - - if test "$ac_cv_mvwdelch_is_expression" = yes -@@ -2927,12 +2807,10 @@ - - AC_MSG_CHECKING(whether WINDOW has _flags) - AC_CACHE_VAL(ac_cv_window_has_flags, --AC_TRY_COMPILE([#include <curses.h>], [ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[ - WINDOW *w; - w->_flags = 0; --], ac_cv_window_has_flags=yes, -- ac_cv_window_has_flags=no, -- ac_cv_window_has_flags=no)) -+]])],[ac_cv_window_has_flags=yes],[ac_cv_window_has_flags=no])) - AC_MSG_RESULT($ac_cv_window_has_flags) - - diff --git a/packages/python/python24-2.4.4/bindir-libdir.patch b/packages/python/python24-2.4.4/bindir-libdir.patch deleted file mode 100644 index 27ae5dce5b..0000000000 --- a/packages/python/python24-2.4.4/bindir-libdir.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- Python-2.4c1/Makefile.pre.in~bindir-libdir.patch -+++ Python-2.4c1/Makefile.pre.in -@@ -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-2.4.4/crosscompile.patch b/packages/python/python24-2.4.4/crosscompile.patch deleted file mode 100644 index f917bb2567..0000000000 --- a/packages/python/python24-2.4.4/crosscompile.patch +++ /dev/null @@ -1,108 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- Python-2.4c1/Makefile.pre.in~crosscompile -+++ Python-2.4c1/Makefile.pre.in -@@ -162,6 +162,7 @@ - - PYTHON= python$(EXE) - BUILDPYTHON= python$(BUILDEXE) -+HOSTPYTHON= $(BUILDPYTHON) - - # === Definitions added by makesetup === - -@@ -188,7 +189,7 @@ - ########################################################################## - # Parser - PGEN= Parser/pgen$(EXE) -- -+HOSTPGEN= $(PGEN)$(EXE) - POBJS= \ - Parser/acceler.o \ - Parser/grammar1.o \ -@@ -320,8 +321,8 @@ - # 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 - - # buildno should really depend on something like LIBRARY_SRC -@@ -442,7 +443,7 @@ - - - $(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) -@@ -718,19 +719,19 @@ - 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 '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 '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 - -@@ -825,7 +826,7 @@ - # 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) \ ---- Python-2.4c1/setup.py~crosscompile -+++ Python-2.4c1/setup.py -@@ -206,6 +206,7 @@ - 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 -@@ -239,8 +240,8 @@ - - def detect_modules(self): - # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -+ # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - - # Add paths to popular package managers on OS X/darwin - if sys.platform == "darwin": -@@ -293,6 +294,9 @@ - - # XXX Omitted modules: gl, pure, dl, SGI-specific modules - -+ lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ] -+ inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ] -+ - # - # The following modules are all pretty straightforward, and compile - # on pretty much any POSIXish platform. diff --git a/packages/python/python24-2.4.4/fix-tkinter-detection.patch b/packages/python/python24-2.4.4/fix-tkinter-detection.patch deleted file mode 100644 index 602aa8e021..0000000000 --- a/packages/python/python24-2.4.4/fix-tkinter-detection.patch +++ /dev/null @@ -1,39 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- Python-2.4.1/setup.py~fix-tkinter-detection -+++ Python-2.4.1/setup.py -@@ -999,7 +999,7 @@ - dotversion = dotversion[:-1] + '.' + dotversion[-1] - tcl_include_sub = [] - tk_include_sub = [] -- for dir in inc_dirs: -+ for dir in [os.getenv("STAGING_INCDIR")]: - tcl_include_sub += [dir + os.sep + "tcl" + dotversion] - tk_include_sub += [dir + os.sep + "tk" + dotversion] - tk_include_sub += tcl_include_sub -@@ -1018,22 +1018,6 @@ - if dir not in include_dirs: - include_dirs.append(dir) - -- # Check for various platform-specific directories -- if platform == 'sunos5': -- include_dirs.append('/usr/openwin/include') -- added_lib_dirs.append('/usr/openwin/lib') -- elif os.path.exists('/usr/X11R6/include'): -- include_dirs.append('/usr/X11R6/include') -- added_lib_dirs.append('/usr/X11R6/lib64') -- added_lib_dirs.append('/usr/X11R6/lib') -- elif os.path.exists('/usr/X11R5/include'): -- include_dirs.append('/usr/X11R5/include') -- added_lib_dirs.append('/usr/X11R5/lib') -- else: -- # Assume default location for X11 -- include_dirs.append('/usr/X11/include') -- added_lib_dirs.append('/usr/X11/lib') -- - # If Cygwin, then verify that X is installed before proceeding - if platform == 'cygwin': - x11_inc = find_file('X11/Xlib.h', [], include_dirs) diff --git a/packages/python/python24-2.4.4/sitebranding.patch b/packages/python/python24-2.4.4/sitebranding.patch deleted file mode 100644 index 85bb83a506..0000000000 --- a/packages/python/python24-2.4.4/sitebranding.patch +++ /dev/null @@ -1,19 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- Python-2.4.3/Lib/site.py~sitebranding -+++ Python-2.4.3/Lib/site.py -@@ -305,8 +305,9 @@ - "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/python24-manifest.inc b/packages/python/python24-manifest.inc deleted file mode 100644 index d08235e42e..0000000000 --- a/packages/python/python24-manifest.inc +++ /dev/null @@ -1,291 +0,0 @@ -######################################################################################################################## -### AUTO-GENERATED by './generate-manifest.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Sat Jul 21 14:25:07 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-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-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="ml2" -RDEPENDS_python-profile="python-core" -FILES_python-profile="${libdir}/python2.4/profile.* ${libdir}/python2.4/pstats.* " - -DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml2" -RDEPENDS_python-threading="python-core python-lang" -FILES_python-threading="${libdir}/python2.4/_threading_local.* ${libdir}/python2.4/dummy_thread.* ${libdir}/python2.4/dummy_threading.* ${libdir}/python2.4/mutex.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* " - -DESCRIPTION_python-distutils="Python Distribution Utilities" -PR_python-distutils="ml2" -RDEPENDS_python-distutils="python-core" -FILES_python-distutils="${libdir}/python2.4/config ${libdir}/python2.4/distutils " - -DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" -PR_python-textutils="ml2" -RDEPENDS_python-textutils="python-core python-io python-re python-stringold" -FILES_python-textutils="${libdir}/python2.4/lib-dynload/_csv.so ${libdir}/python2.4/csv.* ${libdir}/python2.4/optparse.* ${libdir}/python2.4/textwrap.* " - -DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" -PR_python-codecs="ml2" -RDEPENDS_python-codecs="python-core" -FILES_python-codecs="${libdir}/python2.4/codecs.* ${libdir}/python2.4/encodings ${libdir}/python2.4/gettext.* ${libdir}/python2.4/locale.* ${libdir}/python2.4/lib-dynload/_locale.so ${libdir}/python2.4/lib-dynload/unicodedata.so ${libdir}/python2.4/stringprep.* ${libdir}/python2.4/xdrlib.* " - -DESCRIPTION_python-pickle="Python Persistence Support" -PR_python-pickle="ml2" -RDEPENDS_python-pickle="python-core python-codecs python-io python-re" -FILES_python-pickle="${libdir}/python2.4/pickle.* ${libdir}/python2.4/shelve.* ${libdir}/python2.4/lib-dynload/cPickle.so " - -DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml2" -RDEPENDS_python-datetime="python-core python-codecs" -FILES_python-datetime="${libdir}/python2.4/_strptime.* ${libdir}/python2.4/calendar.* ${libdir}/python2.4/lib-dynload/datetime.so " - -DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" -PR_python-core="ml4" -RDEPENDS_python-core="" -FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.* /usr/lib/python2.4/getopt.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/UserList.* /usr/lib/python2.4/UserString.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python* " - -DESCRIPTION_python-io="Python Low-Level I/O" -PR_python-io="ml2" -RDEPENDS_python-io="python-core python-math" -FILES_python-io="${libdir}/python2.4/lib-dynload/_socket.so ${libdir}/python2.4/lib-dynload/_ssl.so ${libdir}/python2.4/lib-dynload/select.so ${libdir}/python2.4/lib-dynload/termios.so ${libdir}/python2.4/lib-dynload/cStringIO.so ${libdir}/python2.4/pipes.* ${libdir}/python2.4/socket.* ${libdir}/python2.4/tempfile.* ${libdir}/python2.4/StringIO.* " - -DESCRIPTION_python-compiler="Python Compiler Support" -PR_python-compiler="ml2" -RDEPENDS_python-compiler="python-core" -FILES_python-compiler="${libdir}/python2.4/compiler " - -DESCRIPTION_python-compression="Python High Level Compression Support" -PR_python-compression="ml2" -RDEPENDS_python-compression="python-core python-zlib" -FILES_python-compression="${libdir}/python2.4/gzip.* ${libdir}/python2.4/zipfile.* " - -DESCRIPTION_python-re="Python Regular Expression APIs" -PR_python-re="ml2" -RDEPENDS_python-re="python-core" -FILES_python-re="${libdir}/python2.4/re.* ${libdir}/python2.4/sre.* ${libdir}/python2.4/sre_compile.* ${libdir}/python2.4/sre_constants* ${libdir}/python2.4/sre_parse.* " - -DESCRIPTION_python-xmlrpc="Python XMLRPC Support" -PR_python-xmlrpc="ml2" -RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" -FILES_python-xmlrpc="${libdir}/python2.4/xmlrpclib.* ${libdir}/python2.4/SimpleXMLRPCServer.* " - -DESCRIPTION_python-terminal="Python Terminal Controlling Support" -PR_python-terminal="ml2" -RDEPENDS_python-terminal="python-core python-io" -FILES_python-terminal="${libdir}/python2.4/pty.* ${libdir}/python2.4/tty.* " - -DESCRIPTION_python-email="Python Email Support" -PR_python-email="ml2" -RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image" -FILES_python-email="${libdir}/python2.4/email " - -DESCRIPTION_python-image="Python Graphical Image Handling" -PR_python-image="ml2" -RDEPENDS_python-image="python-core" -FILES_python-image="${libdir}/python2.4/colorsys.* ${libdir}/python2.4/imghdr.* ${libdir}/python2.4/lib-dynload/imageop.so ${libdir}/python2.4/lib-dynload/rgbimg.so " - -DESCRIPTION_python-core-dbg="Python core module debug information" -PR_python-core-dbg="ml2" -RDEPENDS_python-core-dbg="python-core" -FILES_python-core-dbg="/usr/lib/python2.4/lib-dynload/.debug /usr/bin/.debug /usr/lib/.debug " - -DESCRIPTION_python-resource="Python Resource Control Interface" -PR_python-resource="ml2" -RDEPENDS_python-resource="python-core" -FILES_python-resource="${libdir}/python2.4/lib-dynload/resource.so " - -DESCRIPTION_python-devel="Python Development Package" -PR_python-devel="ml2" -RDEPENDS_python-devel="python-core" -FILES_python-devel="/usr/include /usr/lib/python2.4/config " - -DESCRIPTION_python-math="Python Math Support" -PR_python-math="ml2" -RDEPENDS_python-math="python-core" -FILES_python-math="${libdir}/python2.4/lib-dynload/cmath.so ${libdir}/python2.4/lib-dynload/math.so ${libdir}/python2.4/lib-dynload/_random.so ${libdir}/python2.4/random.* ${libdir}/python2.4/sets.* " - -DESCRIPTION_python-hotshot="Python Hotshot Profiler" -PR_python-hotshot="ml2" -RDEPENDS_python-hotshot="python-core" -FILES_python-hotshot="${libdir}/python2.4/hotshot ${libdir}/python2.4/lib-dynload/_hotshot.so " - -DESCRIPTION_python-unixadmin="Python Unix Administration Support" -PR_python-unixadmin="ml2" -RDEPENDS_python-unixadmin="python-core" -FILES_python-unixadmin="${libdir}/python2.4/lib-dynload/nis.so ${libdir}/python2.4/lib-dynload/grp.so ${libdir}/python2.4/lib-dynload/pwd.so ${libdir}/python2.4/getpass.* " - -DESCRIPTION_python-syslog="Python's syslog Interface" -PR_python-syslog="ml2" -RDEPENDS_python-syslog="python-core" -FILES_python-syslog="${libdir}/python2.4/lib-dynload/syslog.so " - -DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" -PR_python-tkinter="ml2" -RDEPENDS_python-tkinter="python-core" -FILES_python-tkinter="${libdir}/python2.4/lib-dynload/_tkinter.so ${libdir}/python2.4/lib-tk " - -DESCRIPTION_python-gdbm="Python GNU Database Support" -PR_python-gdbm="ml2" -RDEPENDS_python-gdbm="python-core" -FILES_python-gdbm="${libdir}/python2.4/lib-dynload/gdbm.so " - -DESCRIPTION_python-fcntl="Python's fcntl Interface" -PR_python-fcntl="ml2" -RDEPENDS_python-fcntl="python-core" -FILES_python-fcntl="${libdir}/python2.4/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" -FILES_python-netclient="${libdir}/python2.4/*Cookie*.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* " - -DESCRIPTION_python-pprint="Python Pretty-Print Support" -PR_python-pprint="ml2" -RDEPENDS_python-pprint="python-core" -FILES_python-pprint="${libdir}/python2.4/pprint.* " - -DESCRIPTION_python-netserver="Python Internet Protocol Servers" -PR_python-netserver="ml2" -RDEPENDS_python-netserver="python-core python-netclient" -FILES_python-netserver="${libdir}/python2.4/cgi.* ${libdir}/python2.4/BaseHTTPServer.* ${libdir}/python2.4/SimpleHTTPServer.* ${libdir}/python2.4/SocketServer.* " - -DESCRIPTION_python-curses="Python Curses Support" -PR_python-curses="ml2" -RDEPENDS_python-curses="python-core" -FILES_python-curses="${libdir}/python2.4/curses ${libdir}/python2.4/lib-dynload/_curses.so ${libdir}/python2.4/lib-dynload/_curses_panel.so " - -DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon" -PR_python-smtpd="ml2" -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="ml2" -RDEPENDS_python-html="python-core" -FILES_python-html="${libdir}/python2.4/formatter.* ${libdir}/python2.4/htmlentitydefs.* ${libdir}/python2.4/htmllib.* ${libdir}/python2.4/markupbase.* ${libdir}/python2.4/sgmllib.* " - -DESCRIPTION_python-readline="Python Readline Support" -PR_python-readline="ml2" -RDEPENDS_python-readline="python-core" -FILES_python-readline="${libdir}/python2.4/lib-dynload/readline.so ${libdir}/python2.4/rlcompleter.* " - -DESCRIPTION_python-subprocess="Python Subprocess Support" -PR_python-subprocess="ml2" -RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle" -FILES_python-subprocess="${libdir}/python2.4/subprocess.* " - -DESCRIPTION_python-pydoc="Python Interactive Help Support" -PR_python-pydoc="ml2" -RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" -FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.4/pydoc.* " - -DESCRIPTION_python-logging="Python Logging Support" -PR_python-logging="ml2" -RDEPENDS_python-logging="python-core" -FILES_python-logging="${libdir}/python2.4/logging " - -DESCRIPTION_python-mailbox="Python Mailbox Format Support" -PR_python-mailbox="ml2" -RDEPENDS_python-mailbox="python-core python-mime" -FILES_python-mailbox="${libdir}/python2.4/mailbox.* " - -DESCRIPTION_python-xml="Python basic XML support." -PR_python-xml="ml2" -RDEPENDS_python-xml="python-core python-re" -FILES_python-xml="${libdir}/python2.4/lib-dynload/pyexpat.so ${libdir}/python2.4/xml ${libdir}/python2.4/xmllib.* " - -DESCRIPTION_python-mime="Python MIME Handling APIs" -PR_python-mime="ml2" -RDEPENDS_python-mime="python-core python-io" -FILES_python-mime="${libdir}/python2.4/mimetools.* ${libdir}/python2.4/uu.* ${libdir}/python2.4/quopri.* ${libdir}/python2.4/rfc822.* " - -DESCRIPTION_python-tests="Python Tests" -PR_python-tests="ml2" -RDEPENDS_python-tests="python-core" -FILES_python-tests="${libdir}/python2.4/test " - -DESCRIPTION_python-unittest="Python Unit Testing Framework" -PR_python-unittest="ml2" -RDEPENDS_python-unittest="python-core python-stringold python-lang" -FILES_python-unittest="${libdir}/python2.4/unittest.* " - -DESCRIPTION_python-stringold="Python String APIs [deprecated]" -PR_python-stringold="ml2" -RDEPENDS_python-stringold="python-core python-re" -FILES_python-stringold="${libdir}/python2.4/lib-dynload/strop.so ${libdir}/python2.4/string.* " - -DESCRIPTION_python-robotparser="Python robots.txt parser" -PR_python-robotparser="ml2" -RDEPENDS_python-robotparser="python-core python-netclient" -FILES_python-robotparser="${libdir}/python2.4/robotparser.* " - -DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" -PR_python-lib-old-and-deprecated="ml2" -RDEPENDS_python-lib-old-and-deprecated="python-core" -FILES_python-lib-old-and-deprecated="${libdir}/python2.4/lib-old " - -DESCRIPTION_python-compile="Python Bytecode Compilation Support" -PR_python-compile="ml2" -RDEPENDS_python-compile="python-core" -FILES_python-compile="${libdir}/python2.4/py_compile.* ${libdir}/python2.4/compileall.* " - -DESCRIPTION_python-debugger="Python Debugger" -PR_python-debugger="ml2" -RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell" -FILES_python-debugger="${libdir}/python2.4/bdb.* ${libdir}/python2.4/pdb.* " - -DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml2" -RDEPENDS_python-shell="python-core python-re" -FILES_python-shell="${libdir}/python2.4/cmd.* ${libdir}/python2.4/commands.* ${libdir}/python2.4/dircache.* ${libdir}/python2.4/fnmatch.* ${libdir}/python2.4/glob.* ${libdir}/python2.4/popen2.* ${libdir}/python2.4/shutil.* " - -DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" -PR_python-bsddb="ml2" -RDEPENDS_python-bsddb="python-core" -FILES_python-bsddb="${libdir}/python2.4/bsddb " - -DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" -PR_python-mmap="ml2" -RDEPENDS_python-mmap="python-core python-io" -FILES_python-mmap="${libdir}/python2.4/lib-dynload/mmap.so " - -DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml2" -RDEPENDS_python-zlib="python-core" -FILES_python-zlib="${libdir}/python2.4/lib-dynload/zlib.so " - -DESCRIPTION_python-db="Python File-Based Database Support" -PR_python-db="ml2" -RDEPENDS_python-db="python-core" -FILES_python-db="${libdir}/python2.4/anydbm.* ${libdir}/python2.4/dumbdbm.* ${libdir}/python2.4/whichdb.* " - -DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" -PR_python-crypt="ml2" -RDEPENDS_python-crypt="python-core" -FILES_python-crypt="${libdir}/python2.4/lib-dynload/crypt.so ${libdir}/python2.4/lib-dynload/md5.so ${libdir}/python2.4/lib-dynload/rotor.so ${libdir}/python2.4/lib-dynload/sha.so " - -DESCRIPTION_python-idle="Python Integrated Development Environment" -PR_python-idle="ml2" -RDEPENDS_python-idle="python-core python-tkinter" -FILES_python-idle="/usr/bin/idle /usr/lib/python2.4/idlelib " - -DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml2" -RDEPENDS_python-lang="python-core" -FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/lib-dynload/itertools.so ${libdir}/python2.4/lib-dynload/collections.so ${libdir}/python2.4/lib-dynload/_bisect.so ${libdir}/python2.4/lib-dynload/_heapq.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/bisect.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/heapq.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* " - -DESCRIPTION_python-audio="Python Audio Handling" -PR_python-audio="ml2" -RDEPENDS_python-audio="python-core" -FILES_python-audio="${libdir}/python2.4/wave.* ${libdir}/python2.4/chunk.* ${libdir}/python2.4/sndhdr.* ${libdir}/python2.4/lib-dynload/ossaudiodev.so ${libdir}/python2.4/lib-dynload/audioop.so " - - - diff --git a/packages/python/python24-native-2.4.0/bindir-libdir.patch b/packages/python/python24-native-2.4.0/bindir-libdir.patch deleted file mode 100644 index 999bddc449..0000000000 --- a/packages/python/python24-native-2.4.0/bindir-libdir.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Python-2.3.1/Makefile.pre.in~bindir-libdir 2003-09-20 12:50:28.000000000 +0200 -+++ Python-2.3.1/Makefile.pre.in 2003-11-02 19:53:17.000000000 +0100 -@@ -78,8 +78,8 @@ - exec_prefix= @exec_prefix@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include diff --git a/packages/python/python24-native-2.4.0/cross-distutils.patch b/packages/python/python24-native-2.4.0/cross-distutils.patch deleted file mode 100644 index 76ae883c1d..0000000000 --- a/packages/python/python24-native-2.4.0/cross-distutils.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Python-2.3.3/Lib/distutils/sysconfig.py~cross-distutils 2003-02-10 15:02:33.000000000 +0100 -+++ Python-2.3.3/Lib/distutils/sysconfig.py 2004-03-02 20:15:05.000000000 +0100 -@@ -19,8 +19,8 @@ - from errors import DistutilsPlatformError - - # These are needed in a couple of spots, so just compute them once. --PREFIX = os.path.normpath(sys.prefix) --EXEC_PREFIX = os.path.normpath(sys.exec_prefix) -+PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) -+EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - # python_build: (Boolean) if true, we're either building Python or - # building an extension with an un-installed Python, so we use -@@ -192,7 +192,8 @@ - else: - # The name of the config.h file changed in 2.2 - config_h = 'pyconfig.h' -- return os.path.join(inc_dir, config_h) -+ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded" -+ return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def get_makefile_filename(): -@@ -200,7 +201,8 @@ - if python_build: - return os.path.join(os.path.dirname(sys.executable), "Makefile") - lib_dir = get_python_lib(plat_specific=1, standard_lib=1) -- return os.path.join(lib_dir, "config", "Makefile") -+ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded" -+ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def parse_config_h(fp, g=None): diff --git a/packages/python/python24-native-2.4.0/dont-modify-shebang-line.patch b/packages/python/python24-native-2.4.0/dont-modify-shebang-line.patch deleted file mode 100644 index 54109afd62..0000000000 --- a/packages/python/python24-native-2.4.0/dont-modify-shebang-line.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# 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/python24-native_2.4.0.bb b/packages/python/python24-native_2.4.0.bb deleted file mode 100644 index 15b2b4c0fe..0000000000 --- a/packages/python/python24-native_2.4.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Python Programming Language" -HOMEPAGE = "http://www.python.org" -LICENSE = "PSF" -SECTION = "devel/python" -PRIORITY = "optional" -DEPENDS = "" -PR = "r2" - -EXCLUDE_FROM_WORLD = "1" - -SRC_URI = "http://www.python.org/ftp/python/2.4/Python-2.4.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://cross-distutils.patch;patch=1 \ - file://dont-modify-shebang-line.patch;patch=1" -S = "${WORKDIR}/Python-2.4" - -inherit autotools native - -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" - -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 pgen for later usage with non-native builds - install Parser/pgen ${STAGING_BINDIR_NATIVE}/ -} - diff --git a/packages/python/python24-pyqt2/features b/packages/python/python24-pyqt2/features deleted file mode 100644 index 6fe74cafe4..0000000000 --- a/packages/python/python24-pyqt2/features +++ /dev/null @@ -1,31 +0,0 @@ --x Qt_THREAD_SUPPORT --x Qt_CODECS --x Qt_COLORDIALOG --x Qt_DIAL --x Qt_DOM --x Qt_DRAGANDDROP --x Qt_IMAGE_TEXT --x Qt_INPUTDIALOG --x Qt_FILEDIALOG --x Qt_FONTDIALOG --x Qt_MIMECLIPBOARD --x Qt_NETWORKPROTOCOL --x Qt_NETWORKPROTOCOL_FTP --x Qt_NETWORKPROTOCOL_HTTP --x Qt_PICTURE --x Qt_PRINTDIALOG --x Qt_PRINTER --x Qt_PROGRESSDIALOG --x Qt_PROPERTIES --x Qt_SEMIMODAL --x Qt_SIZEGRIP --x Qt_SPLITTER --x Qt_STYLE_CDE --x Qt_STYLE_INTERLACE --x Qt_STYLE_MOTIF --x Qt_STYLE_MOTIFPLUS --x Qt_STYLE_PLATINUM --x Qt_STYLE_SGI --x Qt_TRANSFORMATIONS --x Qt_WIZARD --x Qt_WORKSPACE diff --git a/packages/python/python24-pyqt2/qt2-fix.patch b/packages/python/python24-pyqt2/qt2-fix.patch deleted file mode 100644 index 5ee978e8f6..0000000000 --- a/packages/python/python24-pyqt2/qt2-fix.patch +++ /dev/null @@ -1,124 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- PyQt-x11-gpl-3.13/sip/qtcanvas/qcanvas.sip~qt2-fix -+++ PyQt-x11-gpl-3.13/sip/qtcanvas/qcanvas.sip -@@ -235,7 +235,7 @@ - sipClass = sipClass_QCanvasLine; - break; - --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - case 8: - sipClass = sipClass_QCanvasSpline; - break; ---- PyQt-x11-gpl-3.13/sip/qttable/qtable.sip~qt2-fix -+++ PyQt-x11-gpl-3.13/sip/qttable/qtable.sip -@@ -114,7 +114,7 @@ - %ConvertToSubClassCode - Py_BEGIN_ALLOW_THREADS - --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - int rtti = sipCpp -> rtti(); - - if (rtti == QCheckTableItem::RTTI) ---- PyQt-x11-gpl-3.13/sip/qt/qobject.sip~qt2-fix -+++ PyQt-x11-gpl-3.13/sip/qt/qobject.sip -@@ -102,7 +102,7 @@ - #endif - {sipName_QComboBox, &sipClass_QComboBox}, - {sipName_QCommonStyle, &sipClass_QCommonStyle}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QDateEdit, &sipClass_QDateEdit}, - {sipName_QDateTimeEdit, &sipClass_QDateTimeEdit}, - {sipName_QDesktopWidget, &sipClass_QDesktopWidget}, -@@ -111,13 +111,13 @@ - {sipName_QDial, &sipClass_QDial}, - #endif - {sipName_QDialog, &sipClass_QDialog}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QDockArea, &sipClass_QDockArea}, - {sipName_QDockWindow, &sipClass_QDockWindow}, - #endif - {sipName_QDoubleValidator, &sipClass_QDoubleValidator}, - {sipName_QDragObject, &sipClass_QDragObject}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QErrorMessage, &sipClass_QErrorMessage}, - #endif - #if QT_VERSION >= 0x030100 -@@ -133,7 +133,7 @@ - {sipName_QFrame, &sipClass_QFrame}, - {sipName_QGrid, &sipClass_QGrid}, - {sipName_QGridLayout, &sipClass_QGridLayout}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QGridView, &sipClass_QGridView}, - #endif - {sipName_QGroupBox, &sipClass_QGroupBox}, -@@ -175,7 +175,7 @@ - {sipName_QNetworkOperation, &sipClass_QNetworkOperation}, - {sipName_QNetworkProtocol, &sipClass_QNetworkProtocol}, - #endif --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QObjectCleanupHandler, &sipClass_QObjectCleanupHandler}, - #endif - #if defined(SIP_FEATURE_Qt_STYLE_PLATINUM) -@@ -185,7 +185,7 @@ - #if defined(WS_X11) && defined(SIP_FEATURE_Qt_PRINTDIALOG) - {sipName_QPrintDialog, &sipClass_QPrintDialog}, - #endif --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QProcess, &sipClass_QProcess}, - #endif - {sipName_QProgressBar, &sipClass_QProgressBar}, -@@ -194,7 +194,7 @@ - #endif - {sipName_QPushButton, &sipClass_QPushButton}, - {sipName_QRadioButton, &sipClass_QRadioButton}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QRegExpValidator, &sipClass_QRegExpValidator}, - #endif - #if QT_VERSION >= 220 && defined(SIP_FEATURE_Qt_STYLE_SGI) -@@ -229,11 +229,11 @@ - {sipName_QTabWidget, &sipClass_QTabWidget}, - {sipName_QTextBrowser, &sipClass_QTextBrowser}, - {sipName_QTextDrag, &sipClass_QTextDrag}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QTextEdit, &sipClass_QTextEdit}, - #endif - {sipName_QTextView, &sipClass_QTextView}, --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - {sipName_QTimeEdit, &sipClass_QTimeEdit}, - #endif - {sipName_QTimer, &sipClass_QTimer}, ---- PyQt-x11-gpl-3.13/sip/qt/qevent.sip~qt2-fix -+++ PyQt-x11-gpl-3.13/sip/qt/qevent.sip -@@ -528,7 +528,7 @@ - sipClass = sipClass_QChildEvent; - break; - --#if QT_VERSION >= 300 -+#if QT_VERSION >= 0x030000 - case QEvent::ContextMenu: - sipClass = sipClass_QContextMenuEvent; - break; -@@ -539,7 +539,7 @@ - break; - #endif - --#if QT_VERSION >= 300 && QT_VERSION < 0x030100 -+#if QT_VERSION >= 0x030000 && QT_VERSION < 0x030100 - case QEvent::IMCompose: - sipClass = sipClass_QIMEvent; - break; diff --git a/packages/python/python24-pyqt2_3.13.bb b/packages/python/python24-pyqt2_3.13.bb deleted file mode 100644 index dc93d28a09..0000000000 --- a/packages/python/python24-pyqt2_3.13.bb +++ /dev/null @@ -1,59 +0,0 @@ -DESCRIPTION = "Python Qt/Embedded + Qt/Palmtop Bindings" -HOMEPAGE = "http://www.vanille.de/projects/python.spy" -AUTHOR = "Phil Thomson @ riverbank.co.uk" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "virtual/libqte2 virtual/libqpe1" -RDEPENDS = "python-core python24-sip" -SRCNAME = "pyqt" -PR = "ml5" - -SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \ - file://qt2-fix.patch;patch=1 \ - file://features" -S = "${WORKDIR}/PyQt-x11-gpl-${PV}" - -inherit palmtop sip3 distutils-base - -QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" -SIP_MODULES = "qt qtcanvas qttable qtpe" -SIP_FEATURES = "${WORKDIR}/features" -EXTRA_OEMAKE = " MAKEFLAGS= " - -EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic \ - QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc \ - QMAKE_RPATH=-Wl,-rpath-link, \ - DESTDIR= \ - VERSION=1.0.0 \ - DEFINES+=SIP_MAKE_DLL \ - DEFINES+=SIP_QT_SUPPORT \ - INCLUDEPATH+=. \ - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ - INCLUDEPATH+=${STAGING_INCDIR} \ - LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages" - -do_configure_prepend() { - printf "TEMPLATE=subdirs\nSUBDIRS=qt qtcanvas qttable qtpe\n" >pyqt.pro -} - -do_stage() { - install -d ${STAGING_SIPDIR}/qt/ - for module in ${SIP_MODULES} - do - install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/ - install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so - done -} - -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ - for module in ${SIP_MODULES} - do - install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so - done -} - -FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages" -FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/.debug" diff --git a/packages/python/python24-pyqwt2/features b/packages/python/python24-pyqwt2/features deleted file mode 100644 index 56eab20b69..0000000000 --- a/packages/python/python24-pyqwt2/features +++ /dev/null @@ -1,30 +0,0 @@ --x Qt_THREAD_SUPPORT --x Qt_CODECS --x Qt_COLORDIALOG --x Qt_DIAL --x Qt_DOM --x Qt_DRAGANDDROP --x Qt_IMAGE_TEXT --x Qt_INPUTDIALOG --x Qt_FILEDIALOG --x Qt_FONTDIALOG --x Qt_MIMECLIPBOARD --x Qt_NETWORKPROTOCOL --x Qt_NETWORKPROTOCOL_FTP --x Qt_PICTURE --x Qt_PRINTDIALOG --x Qt_PRINTER --x Qt_PROGRESSDIALOG --x Qt_PROPERTIES --x Qt_SEMIMODAL --x Qt_SIZEGRIP --x Qt_SPLITTER --x Qt_STYLE_CDE --x Qt_STYLE_INTERLACE --x Qt_STYLE_MOTIF --x Qt_STYLE_MOTIFPLUS --x Qt_STYLE_PLATINUM --x Qt_STYLE_SGI --x Qt_TRANSFORMATIONS --x Qt_WIZARD --x Qt_WORKSPACE diff --git a/packages/python/python24-pyqwt2/qt2.x-compat.patch b/packages/python/python24-pyqwt2/qt2.x-compat.patch deleted file mode 100644 index 249ff4a5ee..0000000000 --- a/packages/python/python24-pyqwt2/qt2.x-compat.patch +++ /dev/null @@ -1,28 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- PyQwt-20040118/sip/qwtarray.sip~add-missing-feature-tests 2003-12-14 16:54:29.000000000 +0100 -+++ PyQwt-20040118/sip/qwtarray.sip 2004-01-29 18:31:21.000000000 +0100 -@@ -34,11 +34,10 @@ - // educational versions of Qt, PyQt and sip, PyQwt becomes a free plug-in - // for a non-free program. - -- - %MappedType QwtArray<long> - { - %TypeHeaderCode --#include <qmemarray.h> -+//#include <qmemarray.h> - %End - - %ConvertFromTypeCode -@@ -339,7 +338,6 @@ - %End // ConvertToTypeCode - }; // QwtArray<QwtEventPattern::MousePattern> - -- - // Local Variables: - // mode: C++ - // c-file-style: "stroustrup" diff --git a/packages/python/python24-pyqwt2_3.10.bb b/packages/python/python24-pyqwt2_3.10.bb deleted file mode 100644 index 4f1f9bc0c9..0000000000 --- a/packages/python/python24-pyqwt2_3.10.bb +++ /dev/null @@ -1,65 +0,0 @@ -DESCRIPTION = "Python QWT Bindings, QtE edition" -HOMEPAGE = "http://www.vanille.de/projects/python.spy" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -RDEPENDS = "python-core python-sip python-pyqt (>=${PV}) python-numeric qwt" -DEPENDS = "virtual/libqte2 python-numeric python-pyqt qwt" -SRCNAME = "pyqwt" -PR = "ml4" - -SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \ - file://qt2.x-compat.patch;patch=1 \ - file://features" -S = "${WORKDIR}/PyQwt-20040118" - -inherit palmtop sip3 distutils-base - -QMAKE_PROFILES = "pyqwt.pro" -EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" -SIP_MODULES = "qwt" -SIP_FEATURES = "${WORKDIR}/features" -EXTRA_OEMAKE = " MAKEFLAGS= " - -EXTRA_QMAKEVARS_POST += "TARGET=qwt \ - DESTDIR= \ - VERSION=1.0.0 \ - DEFINES+=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT \ - DEFINES+=HAS_NUMERIC DEFINES+=QWT_NO_MEMARRAY \ - INCLUDEPATH+=../numpy \ - INCLUDEPATH+=${S}/qwt-sources/include \ - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ - INCLUDEPATH+=${STAGING_INCDIR} \ - LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages" - -do_generate_prepend() { - printf "TEMPLATE=subdirs\nSUBDIRS=qwt\n" >pyqwt.pro - - echo "%Makefile qwt.pro.in" >>sip/qwtmod.sip - echo "TEMPLATE=lib" >>sip/qwtmod.sip - echo 'SOURCES = $B' >>sip/qwtmod.sip - echo 'HEADERS = $H' >>sip/qwtmod.sip - echo "%End" >>sip/qwtmod.sip - - mkdir -p sip/qwt/ - mv sip/*.* sip/qwt/ -} - -do_stage() { - install -d ${STAGING_SIPDIR}/qt/ - for module in ${SIP_MODULES} - do - install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/ - install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so - done -} - -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ - for module in ${SIP_MODULES} - do - install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so - done -} - -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages" diff --git a/packages/python/python24-sip_4.1.1.bb b/packages/python/python24-sip_4.1.1.bb deleted file mode 100644 index 718b019af9..0000000000 --- a/packages/python/python24-sip_4.1.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries" -SECTION = "devel/python" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "virtual/libqte2 python24" -RDEPENDS = "python-core" -PR = "ml4" - -SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz" -S = "${WORKDIR}/sip-${PV}/siplib" - -inherit palmtop distutils-base - -EXTRA_QMAKEVARS_POST += "TEMPLATE=lib \ - DESTDIR= \ - VERSION=1.0.0 \ - TARGET=sip \ - DEFINES=SIP_QT_SUPPORT \ - INCLUDEPATH+=. \ - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ - INCLUDEPATH+=${STAGING_INCDIR}" - -do_configure_prepend() { - cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro -} - -do_stage() { - install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/ - oe_libinstall -so libsip ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/ - install -m 0644 sip.h ${STAGING_INCDIR}/sip.h -} - -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ - install libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so -} - -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so" - diff --git a/packages/python/python24_2.4.4.bb b/packages/python/python24_2.4.4.bb deleted file mode 100644 index 313075094e..0000000000 --- a/packages/python/python24_2.4.4.bb +++ /dev/null @@ -1,79 +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 tcl tk" -DEPENDS_sharprom = "python-native readline zlib gdbm openssl" -PR = "ml2" - -PYTHON_MAJMIN = "2.4" - -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://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 libpython2.4 ${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 python24-manifest.inc - -RPROVIDES_python-core = "python" -RPROVIDES_python-curses = "python" -PACKAGES =+ "libpython2" -FILES_libpython2 = "${libdir}/libpython*" - -# catch all the rest (unsorted) -PACKAGES += "python-misc" -FILES_python-misc = "${libdir}/python2.4" - -# catch manpage -PACKAGES += "python-man" -FILES_python-man = "${datadir}/man" - |