[oe-commits] org.oe.dreambox python-2.5.1: fix cross compile

[tmbinc commit]

python-2.5.1: fix cross compile

Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: d6677ae330877b7c362ff9ff0fb38af9afca7044
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d6677ae330877b7c362ff9ff0fb38af9afca7044
Files:
1
packages/python/python-2.5.1/crosscompile.patch
packages/python/python_2.5.1.bb
Diffs:

#
# mt diff -ra839e48bf12e8a92055bbf0f72f4bcaddcc9c392 -rd6677ae330877b7c362ff9ff0fb38af9afca7044
#
# 
# 
# patch "packages/python/python-2.5.1/crosscompile.patch"
#  from [129888514bf498e309cb37dc03286cd2bb81f4bb]
#    to [894552066f534c951f0e05b2bfc42e4b5395d840]
# 
# patch "packages/python/python_2.5.1.bb"
#  from [282f62846797199a09c7b1072fb21aefd7a6ecb7]
#    to [6b19eade825ab32f239414c5250d1013e2cbf3ab]
# 
============================================================
--- packages/python/python-2.5.1/crosscompile.patch	129888514bf498e309cb37dc03286cd2bb81f4bb
+++ packages/python/python-2.5.1/crosscompile.patch	894552066f534c951f0e05b2bfc42e4b5395d840
@@ -103,3 +103,17 @@ diff -Naur Python-2.5/setup.py Python-2.
          #
          # The following modules are all pretty straightforward, and compile
          # on pretty much any POSIXish platform.
+--- Python-2.5.1/setup.py	2007-06-27 18:22:04.000000000 +0200
++++ Python-2.5.1/setup.py	2007-06-27 20:29:23.000000000 +0200
+@@ -1138,6 +1139,11 @@
+ 
+         # Call the method for detecting whether _tkinter can be compiled
+         self.detect_tkinter(inc_dirs, lib_dirs)
++	
++	additional_dir = os.getenv( "PYTHON_LIBDIR" )
++	for x in self.extensions:
++	    x.library_dirs.append(additional_dir)
++	    x.runtime_library_dirs.append(additional_dir)
+ 
+     def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
+         # The _tkinter module, using frameworks. Since frameworks are quite
============================================================
--- packages/python/python_2.5.1.bb	282f62846797199a09c7b1072fb21aefd7a6ecb7
+++ packages/python/python_2.5.1.bb	6b19eade825ab32f239414c5250d1013e2cbf3ab
@@ -44,7 +44,9 @@ do_compile() {
 		   HOSTPYTHON=${STAGING_BINDIR}/python \
 		   STAGING_LIBDIR=${STAGING_LIBDIR} \
 		   STAGING_INCDIR=${STAGING_INCDIR} \
-		   BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS}
+		   PYTHON_LIBDIR=${S} \
+		   BUILD_SYS=${BUILD_SYS} \
+		   HOST_SYS=${HOST_SYS}
 }
 
 do_stage() {
@@ -57,7 +59,8 @@ do_install() {
         oe_runmake HOSTPGEN=${STAGING_BINDIR}/pgen \
                    HOSTPYTHON=${STAGING_BINDIR}/python \
                    STAGING_LIBDIR=${STAGING_LIBDIR} \
-                   STAGING_INCDIR=${STAGING_INCDIR} \
+		   STAGING_INCDIR=${STAGING_INCDIR} \
+		   PYTHON_LIBDIR=${S} \
 		   BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
 		   DESTDIR=${D} install
 }