X-Git-Url: http://gitweb/?a=blobdiff_plain;f=python%2FPkgfile;h=cd823bde2cb0f1adc9cd5ab2d4e27156ce11bf66;hb=40a26b078438dc295e52300af9936f5cc2ffc6be;hp=4e4420ca88a6acc13ff5812aff424a5354e69544;hpb=91e8c92959712f40a9ea9c5027b97482c25e41eb;p=attic%2Fports%2Fopt-cross.git

diff --git a/python/Pkgfile b/python/Pkgfile
index 4e4420c..cd823bd 100644
--- a/python/Pkgfile
+++ b/python/Pkgfile
@@ -1,52 +1,73 @@
 # Description: Python interpreter, version 2.6
 # URL: http://www.python.org
 # Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de
-# Arch Maintainer: CRUX-ARM System Team, crux-arm at mikeux dot dyndns dot org
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Depends on: db gdbm ncurses openssl readline bzip2 zlib
 
 name=python
 version=2.6.4
-release=1
+release=2
 source=(http://www.python.org/ftp/$name/$version/Python-$version.tar.bz2 \
-        $name-$version.cross_compilation.patch $name-2.6.patch)
+        $name-$version.cross_compilation.patch)
 
 build () {
   cd Python-$version
   
   patch -p1 -i $SRC/$name-$version.cross_compilation.patch
-  patch -p1 -i $SRC/$name-2.6.patch
 
   SAVED_CFLAGS="$CFLAGS" SAVED_CXXFLAGS="$CXXFLAGS"
   SAVED_AR="$AR" SAVED_RANLIB="$RANLIB"
   unset CC CFLAGS CXX CXXFLAGS AR RANLIB
+
   ./configure
+
   make python Parser/pgen
   mv python hostpython
   mv Parser/pgen Parser/hostpgen
   make distclean
   
-  CC="$CTARGET-gcc"  CXX="$CTARGET-g++" AR="$AR" RANLIB="$RANLIB" \
-  CFLAGS="$SAVED_CFLAGS" CXXFLAGS="$SAVED_CXXFLAGS" \
+  sed -i setup.py \
+      -e "s|'/usr/local|'$CLFS/usr|g" \
+      -e "s|'/lib|'$CLFS/lib|g" \
+      -e "s|'/usr/lib|'$CLFS/usr/lib|g" \
+      -e "s|'/usr/include|'$CLFS/usr/include|g"
+
+  CC="$CTARGET-gcc"  CXX="$CTARGET-g++" \
+  CFLAGS="$SAVED_CFLAGS -I$CLFS/usr/include" CXXFLAGS="$CFLAGS" \
+  AR="$SAVED_AR" RANLIB="$SAVED_RANLIB" \
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
-              --mandir=/usr/man
+              --mandir=/usr/man 
+
   make HOSTPYTHON="./hostpython" \
        HOSTPGEN="./Parser/hostpgen" \
        BLDSHARED="$CTARGET-gcc -shared" \
        EXTRA_CFLAGS="$CFLAGS" \
        CROSS_COMPILE="yes"
+
   make HOSTPYTHON="./hostpython" \
        HOSTPGEN="./Parser/hostpgen" \
        DESTDIR=$PKG install
+
+  make libpython2.6.so
+  install -D -m 0755 libpython2.6.so $PKG/usr/lib/libpython2.6.so.1.0
+  ln -sf libpython2.6.so.1.0 $PKG/usr/lib/libpython2.6.so
+  rm -f $PKG/usr/lib/libpython2.6.a
+  mv $PKG/usr/lib/python2.6/lib-dynload/_socket{module,}.so
+  mv $PKG/usr/lib/python2.6/lib-dynload/datetime{module,}.so
+  mv $PKG/usr/lib/python2.6/lib-dynload/math{module,}.so
+  mv $PKG/usr/lib/python2.6/lib-dynload/select{module,}.so
+  mv $PKG/usr/lib/python2.6/lib-dynload/time{module,}.so
+  chmod 0755 $PKG/usr/lib/python2.6/lib-dynload/*.so
   
   ln -sf python2.6 $PKG/usr/bin/$name
-  ln -s python2.6 $PKG/usr/lib/$name
-  ln -s python2.6 $PKG/usr/include/$name
-  ln -s /usr/lib/libpython2.6.so $PKG/usr/lib/python2.6/config/libpython2.6.so
-  rm -r $PKG/usr/lib/$name/{bsddb,ctypes,email,sqlite3}/test
-  rm -r $PKG/usr/lib/$name/{distutils,json,lib2to3}/tests
-  rm $PKG/usr/lib/$name/{distutils,site-packages,test}/README
-  rm $PKG/usr/lib/$name/idlelib/{ChangeLog,{NEWS,README,TODO}.txt}
-  rm $PKG/usr/lib/$name/ctypes/macholib/README.ctypes
+  ln -sf python2.6 $PKG/usr/lib/$name
+  ln -sf python2.6 $PKG/usr/include/$name
+  ln -sf /usr/lib/libpython2.6.so $PKG/usr/lib/python2.6/config/libpython2.6.so
+  rm -rf $PKG/usr/lib/$name/{bsddb,ctypes,email,sqlite3}/test
+  rm -rf $PKG/usr/lib/$name/{distutils,json,lib2to3}/tests
+  rm -f $PKG/usr/lib/$name/{distutils,site-packages,test}/README
+  rm -f $PKG/usr/lib/$name/idlelib/{ChangeLog,{NEWS,README,TODO}.txt}
+  rm -f $PKG/usr/lib/$name/ctypes/macholib/README.ctypes
 }