[oe-commits] org.oe.dreambox python-2.5.1: add python 2.5.1

tmbinc commit openembedded-commits at lists.openembedded.org
Mon Jun 25 10:23:36 UTC 2007


python-2.5.1: add python 2.5.1

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 0c9a14d83636750c268be7708dd69a65e36f0699
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0c9a14d83636750c268be7708dd69a65e36f0699
Files:
1
packages/python/python-2.5.1
packages/python/python-native-2.5.1
packages/python/python-2.5.1/bindir-libdir.patch
packages/python/python-2.5.1/build-native-md5-sha.patch
packages/python/python-2.5.1/crosscompile.patch
packages/python/python-2.5.1/fix-tkinter-detection.patch
packages/python/python-2.5.1/some_configure_fixes.patch
packages/python/python-2.5.1-manifest.inc
packages/python/python-native-2.5.1/bindir-libdir.patch
packages/python/python-native-2.5.1/cross-distutils.patch
packages/python/python-native-2.5.1/dont-modify-shebang-line.patch
packages/python/python-native_2.5.1.bb
packages/python/python-pygobject_2.12.3.bb
packages/python/python_2.5.1.bb
packages/python/python-crypto_1.9a6.bb
Diffs:

#
# mt diff -rf1b6671de004b924f6d8e4586b9c37c05d3fb7e4 -r0c9a14d83636750c268be7708dd69a65e36f0699
#
# 
# 
# add_dir "packages/python/python-2.5.1"
# 
# add_dir "packages/python/python-native-2.5.1"
# 
# add_file "packages/python/python-2.5.1/bindir-libdir.patch"
#  content [a909dca4a9e768c3e211ad76a9adbeb9b405dfa0]
# 
# add_file "packages/python/python-2.5.1/build-native-md5-sha.patch"
#  content [1ce2ffa52b73275a1382b7e12d10f168c2c65efc]
# 
# add_file "packages/python/python-2.5.1/crosscompile.patch"
#  content [129888514bf498e309cb37dc03286cd2bb81f4bb]
# 
# add_file "packages/python/python-2.5.1/fix-tkinter-detection.patch"
#  content [f05b7fdb40361cea57c0e796ec13fc022466a025]
# 
# add_file "packages/python/python-2.5.1/some_configure_fixes.patch"
#  content [e2b55ed9d793b0a0e856db5e1ad2e305b111cc2d]
# 
# add_file "packages/python/python-2.5.1-manifest.inc"
#  content [4893d2d61d61a2cef96339dc5124cb4a03615277]
# 
# add_file "packages/python/python-native-2.5.1/bindir-libdir.patch"
#  content [f290ca092a783dd292a42b304796b08494719f58]
# 
# add_file "packages/python/python-native-2.5.1/cross-distutils.patch"
#  content [ae16567ccf05a7eec462a5451a8fe26bb0d83650]
# 
# add_file "packages/python/python-native-2.5.1/dont-modify-shebang-line.patch"
#  content [81ab1c8208c2f0c5364c7d5bedcf52b333871cb2]
# 
# add_file "packages/python/python-native_2.5.1.bb"
#  content [6cb4e510fdd942d443278b841e32d816010fc70a]
# 
# add_file "packages/python/python-pygobject_2.12.3.bb"
#  content [030c21a57fed5a57ed5fc5e3089241ea78955224]
# 
# add_file "packages/python/python_2.5.1.bb"
#  content [282f62846797199a09c7b1072fb21aefd7a6ecb7]
# 
# patch "packages/python/python-crypto_1.9a6.bb"
#  from [0801e8b0cd3aad3202ddbc3008b8c558a713bb5a]
#    to [252cf46b3cf0fc79dbbe52f92ac4f586c4843f81]
# 
============================================================
--- packages/python/python-2.5.1/bindir-libdir.patch	a909dca4a9e768c3e211ad76a9adbeb9b405dfa0
+++ packages/python/python-2.5.1/bindir-libdir.patch	a909dca4a9e768c3e211ad76a9adbeb9b405dfa0
@@ -0,0 +1,18 @@
+
+#
+# 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
============================================================
--- packages/python/python-2.5.1/build-native-md5-sha.patch	1ce2ffa52b73275a1382b7e12d10f168c2c65efc
+++ packages/python/python-2.5.1/build-native-md5-sha.patch	1ce2ffa52b73275a1382b7e12d10f168c2c65efc
@@ -0,0 +1,11 @@
+--- python_2.5.1/setup.py.org	2007-06-22 20:07:56.000000000 +0200
++++ python_2.5.1/setup.py	2007-06-22 20:03:44.000000000 +0200
+@@ -571,7 +626,7 @@
+ 
+         #print 'openssl_ver = 0x%08x' % openssl_ver
+ 
+-        if (ssl_incs is not None and
++        if 0 and (ssl_incs is not None and
+             ssl_libs is not None and
+             openssl_ver >= 0x00907000):
+             # The _hashlib module wraps optimized implementations
============================================================
--- packages/python/python-2.5.1/crosscompile.patch	129888514bf498e309cb37dc03286cd2bb81f4bb
+++ packages/python/python-2.5.1/crosscompile.patch	129888514bf498e309cb37dc03286cd2bb81f4bb
@@ -0,0 +1,105 @@
+diff -Naur Python-2.5/Makefile.pre.in Python-2.5-patched/Makefile.pre.in
+--- Python-2.5/Makefile.pre.in	2006-07-30 18:20:10.000000000 +0200
++++ Python-2.5-patched/Makefile.pre.in	2006-12-10 13:20:46.000000000 +0100
+@@ -170,6 +170,7 @@
+ 
+ PYTHON=		python$(EXE)
+ BUILDPYTHON=	python$(BUILDEXE)
++HOSTPYTHON=	$(BUILDPYTHON)
+ 
+ # === Definitions added by makesetup ===
+ 
+@@ -196,7 +197,7 @@
+ ##########################################################################
+ # Parser
+ PGEN=		Parser/pgen$(EXE)
+-
++HOSTPGEN=	$(PGEN)$(EXE)
+ POBJS=		\
+ 		Parser/acceler.o \
+ 		Parser/grammar1.o \
+@@ -345,8 +346,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
+ 
+ # Build static library
+@@ -470,7 +471,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)
+@@ -773,19 +774,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 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
+ 	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
++		$(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+-		./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
++		$(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+-		./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
++		$(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ 
+@@ -885,7 +886,7 @@
+ # 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) \
+diff -Naur Python-2.5/setup.py Python-2.5-patched/setup.py
+--- Python-2.5/setup.py	2006-08-10 01:42:18.000000000 +0200
++++ Python-2.5-patched/setup.py	2006-12-10 13:19:50.000000000 +0100
+@@ -211,6 +211,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
+@@ -244,8 +245,8 @@
+ 
+     def detect_modules(self):
+         # Ensure that /usr/local is always used
+-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+-        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
++        # add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
++        # add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+ 
+         # Add paths specified in the environment variables LDFLAGS and
+         # CPPFLAGS for header and library files.
+@@ -341,6 +342,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.
============================================================
--- packages/python/python-2.5.1/fix-tkinter-detection.patch	f05b7fdb40361cea57c0e796ec13fc022466a025
+++ packages/python/python-2.5.1/fix-tkinter-detection.patch	f05b7fdb40361cea57c0e796ec13fc022466a025
@@ -0,0 +1,39 @@
+
+#
+# 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)
============================================================
--- packages/python/python-2.5.1/some_configure_fixes.patch	e2b55ed9d793b0a0e856db5e1ad2e305b111cc2d
+++ packages/python/python-2.5.1/some_configure_fixes.patch	e2b55ed9d793b0a0e856db5e1ad2e305b111cc2d
@@ -0,0 +1,68 @@
+--- configure.in.org	2007-03-12 11:50:51.000000000 +0100
++++ configure.in	2007-06-18 16:06:00.000000000 +0200
+@@ -3345,62 +3345,11 @@
+   AC_MSG_RESULT(no)
+ )
+ 
+-AC_MSG_CHECKING(for /dev/ptmx)
++AC_CHECK_FILE(/dev/ptmx, AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if we have /dev/ptmx.]))
+ 
+-if test -r /dev/ptmx
+-then
+-  AC_MSG_RESULT(yes)
+-  AC_DEFINE(HAVE_DEV_PTMX, 1,
+-  [Define if we have /dev/ptmx.])
+-else
+-  AC_MSG_RESULT(no)
+-fi
+-
+-AC_MSG_CHECKING(for /dev/ptc)
+-
+-if test -r /dev/ptc
+-then
+-  AC_MSG_RESULT(yes)
+-  AC_DEFINE(HAVE_DEV_PTC, 1,
+-  [Define if we have /dev/ptc.])
+-else
+-  AC_MSG_RESULT(no)
+-fi
+-
+-AC_MSG_CHECKING(for %zd printf() format support)
+-AC_TRY_RUN([#include <stdio.h>
+-#include <stddef.h>
+-#include <string.h>
+-
+-int main()
+-{
+-    char buffer[256];
+-
+-#ifdef HAVE_SSIZE_T
+-typedef ssize_t Py_ssize_t;
+-#elif SIZEOF_VOID_P == SIZEOF_LONG
+-typedef long Py_ssize_t;
+-#else
+-typedef int Py_ssize_t;
+-#endif
+-
+-    if(sprintf(buffer, "%zd", (size_t)123) < 0)
+-       	return 1;
+-
+-    if (strcmp(buffer, "123"))
+-	return 1;
+-
+-    if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0)
+-       	return 1;
++AC_CHECK_FILE(/dev/ptc, AC_DEFINE(HAVE_DEV_PTC, 1, [Define if we have /dev/ptc.]))
+ 
+-    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_DEFINE(PY_FORMAT_SIZE_T, "z", [Define to printf format modifier for Py_ssize_t])
+ 
+ AC_CHECK_TYPE(socklen_t,,
+   AC_DEFINE(socklen_t,int,
============================================================
--- packages/python/python-2.5.1-manifest.inc	4893d2d61d61a2cef96339dc5124cb4a03615277
+++ packages/python/python-2.5.1-manifest.inc	4893d2d61d61a2cef96339dc5124cb4a03615277
@@ -0,0 +1,273 @@
+########################################################################################################################
+### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey at Vanille.de>] on Thu Mar 30 17:39:30 2006
+###
+### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
+###
+### Warning: Manual edits will be lost!
+###
+########################################################################################################################
+
+pydir=${libdir}/python2.5
+pydyndir=${pydir}/lib-dynload
+
+PACKAGES="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-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-2.5-extensions python-2.5-ctypes python-2.5-sqlite3 "
+
+DESCRIPTION_python-threading="Python Threading & Synchronization Support"
+PR_python-threading="ml0"
+RDEPENDS_python-threading="python-core python-lang"
+FILES_python-threading="${pydir}/_threading_local.* ${pydir}/bisect.* ${pydyndir}/_bisect.so ${pydir}/dummy_thread.* ${pydir}/dummy_threading.* ${pydir}/mutex.* ${pydir}/threading.* ${pydir}/Queue.* "
+
+DESCRIPTION_python-distutils="Python Distribution Utilities"
+PR_python-distutils="ml0"
+RDEPENDS_python-distutils="python-core"
+FILES_python-distutils="${pydir}/config ${pydir}/distutils "
+
+DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
+PR_python-textutils="ml0"
+RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
+FILES_python-textutils="${pydyndir}/_csv.so ${pydir}/csv.* ${pydir}/optparse.* ${pydir}/textwrap.* "
+
+DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
+PR_python-codecs="ml0"
+RDEPENDS_python-codecs="python-core"
+FILES_python-codecs="${pydir}/codecs.* ${pydir}/encodings ${pydir}/gettext.* ${pydir}/locale.* ${pydyndir}/_locale.so ${pydyndir}/unicodedata.so ${pydir}/stringprep.* ${pydir}/xdrlib.* "
+
+DESCRIPTION_python-pickle="Python Persistence Support"
+PR_python-pickle="ml0"
+RDEPENDS_python-pickle="python-core python-codecs python-re"
+FILES_python-pickle="${pydir}/pickle.* ${pydir}/shelve.* ${pydyndir}/cPickle.so "
+
+DESCRIPTION_python-datetime="Python Calendar and Time support"
+PR_python-datetime="ml0"
+RDEPENDS_python-datetime="python-core python-codecs"
+FILES_python-datetime="${pydir}/_strptime.* ${pydir}/calendar.* ${pydyndir}/datetime.so "
+
+DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
+PR_python-core="ml0"
+RDEPENDS_python-core=""
+FILES_python-core="${pydir}/__future__.* ${pydir}/copy.* ${pydir}/copy_reg.* ${pydir}/ConfigParser.py ${pydir}/getopt.* ${pydir}/heapq.* ${pydyndir}/_heapq.so ${pydir}/linecache.* ${pydir}/new.* ${pydir}/os.* ${pydir}/posixpath.* ${pydir}/warnings.* ${pydir}/site.* ${pydir}/stat.* ${pydir}/UserDict.* ${pydyndir}/binascii.so ${pydyndir}/_struct.so ${pydir}/struct.* ${pydyndir}/time.so ${pydyndir}/xreadlines.so ${pydyndir}/dl.so ${pydir}/types.* ${pydir}/pkgutil.* /usr/bin/python "
+
+DESCRIPTION_python-io="Python Low-Level I/O"
+PR_python-io="ml0"
+RDEPENDS_python-io="python-core python-math"
+FILES_python-io="${pydyndir}/_socket.so ${pydyndir}/_ssl.so ${pydyndir}/select.so ${pydyndir}/termios.so ${pydyndir}/cStringIO.so ${pydir}/pipes.* ${pydir}/socket.* ${pydir}/tempfile.* ${pydir}/StringIO.* "
+
+DESCRIPTION_python-compiler="Python Compiler Support"
+PR_python-compiler="ml0"
+RDEPENDS_python-compiler="python-core"
+FILES_python-compiler="${pydir}/compiler "
+
+DESCRIPTION_python-compression="Python High Level Compression Support"
+PR_python-compression="ml0"
+RDEPENDS_python-compression="python-core python-zlib"
+FILES_python-compression="${pydir}/gzip.* ${pydir}/zipfile.* "
+
+DESCRIPTION_python-re="Python Regular Expression APIs"
+PR_python-re="ml0"
+RDEPENDS_python-re="python-core"
+FILES_python-re="${pydir}/re.* $%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list