Alte Workarrounts disabled -> zum Test mit neuer xorg-server Version..

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4673 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2009-05-04 11:36:54 +00:00
parent 4d6ae9d0ed
commit d5c4ab8e7d

View File

@ -72,10 +72,10 @@
SRCPATH=XServ/Server SRCPATH=XServ/Server
premk() { premk() {
cd .. # cd ..
tar -jxvf $LFSSOURCE/$SRCPATH/MesaLib-*.tar.bz2 # tar -jxvf $LFSSOURCE/$SRCPATH/MesaLib-*.tar.bz2
Mesa=`\ls -d $MAKEDIR/Mesa*` Mesa=`\ls -d $MAKEDIR/Mesa*`
cd - # cd -
} }
mk() { mk() {
@ -84,6 +84,7 @@ mk() {
fi fi
CC="gcc $BUILDOPTIONS" \ CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \ ./configure --host=$TARGET \
--localstatedir=/var \ --localstatedir=/var \
--infodir=/usr/share/info \ --infodir=/usr/share/info \
@ -91,17 +92,17 @@ mk() {
$ADDOPTIONS \ $ADDOPTIONS \
--prefix=/usr/X11R7 \ --prefix=/usr/X11R7 \
--with-mesa-source=$Mesa --with-mesa-source=$Mesa
sed -e "s/= -lrt/= -lrt -lGL/" hw/vfb/Makefile >/tmp/Makefile #sed -e "s/= -lrt/= -lrt -lGL/" hw/vfb/Makefile >/tmp/Makefile
mv /tmp/Makefile hw/vfb/Makefile #mv /tmp/Makefile hw/vfb/Makefile
sed -e "s/= -lrt/= -lrt -lGL/" hw/xnest/Makefile >/tmp/Makefile #sed -e "s/= -lrt/= -lrt -lGL/" hw/xnest/Makefile >/tmp/Makefile
mv /tmp/Makefile hw/xnest/Makefile #mv /tmp/Makefile hw/xnest/Makefile
sed -e "s/= -lrt/= -lrt -lGL/" hw/xprint/Makefile >/tmp/Makefile #sed -e "s/= -lrt/= -lrt -lGL/" hw/xprint/Makefile >/tmp/Makefile
mv /tmp/Makefile hw/xprint/Makefile #mv /tmp/Makefile hw/xprint/Makefile
make -j $NUMCPU make -j $NUMCPU
make -j $NUMCPU DESTDIR=$TMPROOT install make -j $NUMCPU DESTDIR=$TMPROOT install
} }
postmk() { postmk() {
GetSVN Viitor_X11 $TMPROOT GetSVN Viitor_X11 $TMPROOT
rm -r $Mesa #rm -r $Mesa
} }