Komplet neu geschrieben - nach anleitung von cblsf

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4652 504e572c-2e33-0410-9681-be2bf7408885

SysBuild/tools/Python

@@ -70,58 +70,77 @@
 #Pfad zum Basis-Sourcetree :
 SRCPATH=Tools/Development
 
+(( MKPKG = $MKPKG | 128 ))
+
 premk() {
-	mkdir -p $TMPROOT/usr/include $TMPROOT/usr/share
-	if [ -d /usr/man ]; then
-		mv /usr/man /usr/man.store
-	fi
+	echo "Nothing to do for premk()"
+}
+
+mk32() {
+	sed -i "s@/usr/X11R6@${XORG_PREFIX}@g" setup.py &&
+	CC="gcc ${BUILDOPTIONS32}" \
+	CXX="g++ ${BUILDOPTIONS32}" \
+	./configure --prefix=/usr \
+		    --with-signal-module \
+		    --with-threads \
+		    --with-cycle-gc \
+		    --with-fpectl \
+                    --enable-shared &&
+	make -j $NUMPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mv -v $TMPROOT/usr/bin/python{,-32} &&
+	mv -v $TMPROOT/usr/bin/python2.6{,-32} &&
+	mv -v $TMPROOT/usr/include/python2.6/pyconfig{,-32}.h
+	make distclean
 }
 
 mk() {
 	if [ "$MK64BIT" == "true" ]; then
 		ADDOPTIONS="--libdir=/usr/lib64"
 	fi
-	CC="gcc $BUILDOPTIONS -fPIC" \
-	CXX="g++ $BUILDOPTIONS -fPIC" \
-	./configure --host=$TARGET \
-        	    --prefix=/usr \
+	SrcPatch $MAKEDIR/Python* $LFSSOURCE/$SRCPATH/Python-*-multilib-*.patch.*
+	sed -i -e "s:@@MULTILIB_DIR@@:lib64:g" \
+	        Lib/distutils/command/install.py \
+	        Lib/distutils/sysconfig.py \
+	        Lib/site.py \
+	        Makefile.pre.in \
+	        Modules/Setup.dist \
+	        Modules/getpath.c \
+	        setup.py
+	CC="gcc $BUILDOPTIONS" \
+	CXX="g++ $BUILDOPTIONS" \
+	./configure --prefix=/usr \
 		    $ADDOPTIONS \
 		    --with-signal-module \
 		    --with-threads \
 		    --with-cycle-gc \
 		    --with-fpectl \
-		    --enable-unicode
-	make -j $NUMCPU LIBDIR=\${prefix}/$LIBDIR \
-	                SCRIPTDIR=\${prefix}/$LIBDIR 
-	make -j $NUMCPU LIBDIR=\${prefix}/$LIBDIR \
-	                SCRIPTDIR=\${prefix}/$LIBDIR -k install
-	make -j $NUMCPU -k inclinstall
-	make -j $NUMCPU prefix=$TMPROOT/usr \
-	                LIBDIR=\${prefix}/$LIBDIR \
-			SCRIPTDIR=\${prefix}/$LIBDIR -k install
-	make -j $NUMCPU prefix=$TMPROOT/usr \
-	                LIBDIR=\${prefix}/$LIBDIR \
-			SCRIPTDIR=\${prefix}/$LIBDIR -k inclinstall
-	cp -rp Include/* $TMPROOT/usr/include
-	cd /usr/$LIBDIR
-	tar -cf - python*|tar -C $TMPROOT/usr/$LIBDIR -xf -
-	cd -
-	if [ "$MK64BIT" == "true" ]; then
-		if [ ! -d $TMPROOT/usr/lib ]; then
-			mkdir $TMPROOT/usr/lib
-		fi
-		ln -s ../lib64/python2.4 $TMPROOT/usr/lib/python2.4
-	fi
-	CheckError "Make install process failed !" 1
-	rm -r /usr/man
+		    --enable-shared
+	make -j $NUMCPU
+	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mv -v $TMPROOT/usr/bin/python{,-64} &&
+	mv -v $TMPROOT/usr/bin/python2.6{,-64} &&
+	mv -v $TMPROOT/usr/include/python2.6/pyconfig{,-64}.h
+	ln -s multiarch_wrapper $TMPROOT/usr/bin/python
+	ln -s multiarch_wrapper $TMPROOT/usr/bin/python2.6
 }
 
 postmk() {
-	mv $TMPROOT/usr/man $TMPROOT/usr/share
-	cd $TMPROOT/usr/include
-	ln -s python[0-9]*/pyconfig.h pyconfig.h
-	cd -
-	if [ -d /usr/man.store ]; then
-		mv /usr/man.store /usr/man
-	fi
+	cat > $TMPROOT/usr/include/python2.6/pyconfig.h << "EOF"
+/* pyconfig.h - Stub Header  */
+#ifndef __STUB__PYCONFIG_H__
+#define __STUB__PYCONFIG_H__
+
+#if defined(__x86_64__) || \
+defined(__sparc64__) || \
+defined(__arch64__) || \
+defined(__powerpc64__) || \
+defined (__s390x__)
+# include "pyconfig-64.h"
+#else
+# include "pyconfig-32.h"
+#endif
+
+#endif /* __STUB__PYCONFIG_H__ */
+EOF
 }