From bed045f083460c7003d9c7d66b08d0aba3f13b40 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Sat, 28 Mar 2009 10:20:23 +0000
Subject: [PATCH] Anpassung an neue Version

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4566 504e572c-2e33-0410-9681-be2bf7408885
---
 BaseBuild/Basesys/autoconf |  3 +--
 BaseBuild/Basesys/automake |  4 +---
 BaseBuild/Basesys/bash     | 10 ++++----
 BaseBuild/Basesys/readline | 48 ++++++++++++++++++++++----------------
 4 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/BaseBuild/Basesys/autoconf b/BaseBuild/Basesys/autoconf
index 73217f1..89981bb 100644
--- a/BaseBuild/Basesys/autoconf
+++ b/BaseBuild/Basesys/autoconf
@@ -75,8 +75,7 @@ premk() {
 
 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure --host=$TARGET \
-		    --prefix=/usr
+	./configure --prefix=/usr
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
diff --git a/BaseBuild/Basesys/automake b/BaseBuild/Basesys/automake
index 8dab8c8..1ae3871 100644
--- a/BaseBuild/Basesys/automake
+++ b/BaseBuild/Basesys/automake
@@ -75,10 +75,8 @@ premk() {
 
 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
-	./configure --host=$TARGET \
-		    --prefix=/usr
+	./configure --prefix=/usr
 	make -j $NUMCPU
-	MakeCheck -j $NUMCPU check
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
diff --git a/BaseBuild/Basesys/bash b/BaseBuild/Basesys/bash
index 534f8c5..a17bd21 100644
--- a/BaseBuild/Basesys/bash
+++ b/BaseBuild/Basesys/bash
@@ -72,20 +72,20 @@ SRCPATH=Base/System
 
 premk() {
 	mkdir -p $TMPROOT/usr/share
-	sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-3.1|" \
-		makefile.in
+	sed -i "/ac_cv_rl_libdir/s@/lib@&64@" configure
 }
 
 mk() {
 	CC="gcc ${BUILDOPTIONS}" \
 	CXX="g++ ${BUILDOPTIONS}" \
-	./configure --host=$TARGET \
-		    --prefix=/usr \
+	./configure --prefix=/usr \
 		    --bindir=/bin \
 		    --without-bash-malloc \
 		    --with-installed-readline
 	make -j $NUMCPU
-	make -j $NUMCPU prefix=$TMPROOT/usr bindir=$TMPROOT/bin install
+	make htmldir=$TMPROOT/usr/share/doc/bash-4.0 \
+	     prefix=$TMPROOT/usr \
+	     bindir=$TMPROOT/bin install
 }
 
 
diff --git a/BaseBuild/Basesys/readline b/BaseBuild/Basesys/readline
index e22b19e..7b44092 100644
--- a/BaseBuild/Basesys/readline
+++ b/BaseBuild/Basesys/readline
@@ -77,6 +77,7 @@ SRCPATH=Base/lib
 premk() {
 	mkdir ../build-readline
 	cd ../build-readline
+	sed -i 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncursesw:' support/shobj-conf
 }
 
 #Hier wird der Make Prozess der Sourcen definiert
@@ -85,9 +86,19 @@ mk32() {
 	CXX="g++ ${BUILDOPTIONS32}" \
 	../readline*/configure --prefix=/usr \
 			       --libdir=/lib
-	make -j $NUMCPU SHLIB_XLDFLAGS=-lncurses
+	make -j $NUMCPU 
 	make -j $NUMCPU install
+	make -j $NUMCPU install-doc
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	make -j $NUMCPU DESTDIR=$TMPROOT install-doc
+	mv -v /lib/lib{readline,history}.a /usr/lib
+	rm -v /lib/lib{readline,history}.so
+	ln -svf ../../lib/libreadline.so.6 /usr/lib/libreadline.so
+	ln -svf ../../lib/libhistory.so.6 /usr/lib/libhistory.so
+	mv -v $TMPROOT/lib/lib{readline,history}.a $TMPROOT/usr/lib
+	rm -v $TMPROOT/lib/lib{readline,history}.so
+	ln -svf ../../lib/libreadline.so.6 $TMPROOT/usr/lib/libreadline.so
+	ln -svf ../../lib/libhistory.so.6 $TMPROOT/usr/lib/libhistory.so
 	cd ../readline*
 	rm -r ../build-readline
 	mkdir ../build-readline
@@ -97,36 +108,33 @@ mk32() {
 mk() {
 	if [ "$MK64BIT" == "true" ]; then
 		ADDOPTIONS="--libdir=/lib64"
+		LIBDIR="lib64"
 	else
 		ADDOPTIONS="--libdir=/lib"
+		LIBDIR="lib"
 	fi
 	CC="gcc ${BUILDOPTIONS}" \
 	CXX="g++ ${BUILDOPTIONS}" \
-	../readline*/configure --host=$TARGET \
-		    $ADDOPTIONS \
-		    --prefix=/usr 
-	make -j $NUMCPU SHLIB_XLDFLAGS=-lncurses &&
+	../readline*/configure $ADDOPTIONS \
+		               --prefix=/usr 
+	make -j $NUMCPU &&
 	make -j $NUMCPU install &&
-	make -j $NUMCPU DESTDIR=$TMPROOT install
+	make -j $NUMCPU install-doc &&
+	make -j $NUMCPU DESTDIR=$TMPROOT install &&
+	make -j $NUMCPU DESTDIR=$TMPROOT install-doc
+	mv -v /$LIBDIR/lib{readline,history}.a /usr/$LIBDIR
+	rm -v /$LIBDIR/lib{readline,history}.so
+	ln -svf ../../$LIBDIR/libreadline.so.6 /usr/$LIBDIR/libreadline.so
+	ln -svf ../../$LIBDIR/libhistory.so.6 /usr/$LIBDIR/libhistory.so
+	mv -v $TMPROOT/$LIBDIR/lib{readline,history}.a $TMPROOT/usr/$LIBDIR
+	rm -v $TMPROOT/$LIBDIR/lib{readline,history}.so
+	ln -svf ../../$LIBDIR/libreadline.so.6 $TMPROOT/usr/$LIBDIR/libreadline.so
+	ln -svf ../../$LIBDIR/libhistory.so.6 $TMPROOT/usr/$LIBDIR/libhistory.so
 }
 
 #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
 #in $TMPROOT noch einiges korrigieren
 postmk() {
-	chmod -v 755 $TMPROOT/lib/lib{readline,history}.so*
-	mkdir -p $TMPROOT/usr/{lib,include}
-	mv -v $TMPROOT/lib/lib{readline,history}.a $TMPROOT/usr/lib
-	rm -v $TMPROOT/lib/lib{readline,history}.so
-	ln -svf ../../lib/libreadline.so.5 $TMPROOT/usr/lib/libreadline.so
-	ln -svf ../../lib/libhistory.so.5 $TMPROOT/usr/lib/libhistory.so
-	if [ "$MK64BIT" == "true" ]; then
-	  chmod -v 755 $TMPROOT/lib64/lib{readline,history}.so*
-	  mkdir -p $TMPROOT/usr/lib64
-	  mv -v $TMPROOT/lib64/lib{readline,history}.a $TMPROOT/usr/lib64
-	  rm -v $TMPROOT/lib64/lib{readline,history}.so
-	  ln -svf ../../lib64/libreadline.so.5 $TMPROOT/usr/lib64/libreadline.so
-	  ln -svf ../../lib64/libhistory.so.5 $TMPROOT/usr/lib64/libhistory.so
-	fi
 	cp -av /usr/include/readline/* $TMPROOT/usr/include/readline
 	cd ../readline*
 	rm -r ../build-readline