Anpassungen an V962, BugFixes

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4743 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2009-05-21 18:43:59 +00:00
parent 313eda0acf
commit 34181e678e
8 changed files with 41 additions and 45 deletions

View File

@ -106,9 +106,11 @@
0 network/ethtool
0 tools/texi2roff
0 tools/mgetty
0 tools/isapnptools
#keine Neue Version, Nich mehr kompilierbar - überflüssig ??
#0 tools/isapnptools
0 tools/autofs
0 tools/cdparanoia-III
0 multimedia/cdparanoia-III
0 tools/recode
0 tools/syslinux
0 tools/gsl

View File

@ -79,8 +79,9 @@ premk() {
}
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
CC="gcc $BUILDOPTIONS32 -fPIC" \
CXX="g++ $BUILDOPTIONS32 -fPIC" \
USE_ARCH=$UARCH \
./configure --target=$TARGET32 \
--prefix=/usr \
--sysconfdir=/etc/sysconfig/a2ps &&
@ -88,14 +89,16 @@ mk32() {
make -j $NUMCPU DESTDIR=$TMPROOT install
CheckError "Make install process failed !" 1
make distclean
GenDynLib32 $TMPROOT/usr/lib/liba2ps.a 4.1.3
}
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
CC="gcc $BUILDOPTIONS -fPIC" \
CXX="g++ $BUILDOPTIONS -fPIC" \
USE_ARCH=$UARCH \
./configure --target=$TARGET \
$ADDOPTIONS \
--prefix=/usr \
@ -103,6 +106,7 @@ mk() {
make -j $NUMCPU &&
make -j $NUMCPU DESTDIR=$TMPROOT install
CheckError "Make install process failed !" 1
GenDynLib $TMPROOT/usr/$LIBDIR/liba2ps.a 4.1.3
}
postmk() {

View File

@ -84,18 +84,16 @@ premk() {
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=/usr/lib64"
mkdir -p $TMPROOT/usr/lib64/autofs
else
mkdir -p $TMPROOT/usr/lib/autofs
mkdir -p $TMPROOT/usr/$LIBDIR/autofs
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
--sysconfdir=/etc/sysconfig \
$ADDOPTIONS \
--mandir=/usr/share/man &&
sed -e "s%rpcgen%rpcgen -Y /usr/bin%" lib/Makefile >/tmp/Makefile
mv /tmp/Makefile lib/Makefile
sed -i -e "s%rpcgen%rpcgen -Y /usr/bin%" lib/Makefile
make &&
make INSTALLROOT=$TMPROOT install
}

View File

@ -76,7 +76,10 @@ SRCPATH=Tools/Utilities
#Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
premk() {
echo "Nothing to do for premk()"
sed -i '/PROTO.*readline/d' bc/scan.l &&
sed -i '/flex -I8/s/8//' configure &&
sed -i '/stdlib/a #include <string.h>' lib/number.c &&
sed -i 's/program.*save/static &/' bc/load.c
}
#Hier wird der Make Prozess der Sourcen definiert
@ -84,7 +87,8 @@ mk() {
CC="gcc $BUILDOPTIONS" \
CXX="gcc $BUILDOPTIONS" \
./configure --host=$TARGET \
--prefix=/usr &&
--prefix=/usr \
--with-readline &&
make -j $NUMCPU &&
make -j $NUMCPU DESTDIR=$TMPROOT install
}

View File

@ -68,39 +68,26 @@
#
#
SRCPATH=Tools/Utilities
SRCPATH=MultiMedia/Apps
#Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
#ausgeführt (sprich unpack src; cd src; premk)
#Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
premk() {
if echo $TARGET|grep i586 >/dev/null 2>&1; then
if echo $CFLAGS|grep -i i586 >/dev/null 2>&1; then
THISSYS=i586-intel-linux
elif echo $CFLAGS|grep -i Pentium >/dev/null 2>&1; then
THISSYS=i586-intel-linux
elif echo $CFLAGS|grep -i k6 >/dev/null 2>&1; then
THISSYS=i586-amd-linux
fi
elif echo $TARGET|grep i686 >/dev/null 2>&1; then
if echo $CFLAGS|grep -i i686 >/dev/null 2>&1; then
THISSYS=i686-intel-linux
elif echo $CFLAGS|grep -i k7 >/dev/null 2>&1; then
THISSYS=i686-amd-linux
fi
fi
echo "Nothing to do for premk()"
}
mk32() {
CC="/opt/gcc-3/bin/gcc -m32" \
CXX="/opt/gcc-3/bin/g++ -m32" \
./configure --host=$THISSYS \
--build=$THISSYS \
--target=$THISSYS \
CFLAGS="$BUILDOPTIONS32 -fPIC" \
./configure --build=$TARGET32 \
--prefix=/usr &&
make &&
make prefix=$TMPROOT/usr install
cp interface/Makefile{,.orig}
cp paranoia/Makefile{,.orig}
sed -i -e "s/-shared/-m32 -shared/" interface/Makefile
sed -i -e "s/-shared/-m32 -shared/" paranoia/Makefile
make CFLAGS="$BUILDOPTIONS32 -fPIC" &&
make CFLAGS="$BUILDOPTIONS32 -fPIC" prefix=$TMPROOT/usr install
make distclean
}
@ -109,15 +96,11 @@ mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
fi
CC="/opt/gcc-3/bin/gcc" \
CXX="/opt/gcc-3/bin/g++" \
./configure --host=$THISSYS \
--build=$THISSYS \
--target=$THISSYS \
./configure --build=$TARGET \
$ADDOPTIONS \
--prefix=/usr &&
make &&
make prefix=$TMPROOT/usr install
make CFLAGS="$BUILDOPTIONS -fPIC" &&
make CFLAGS="$BUILDOPTIONS -fPIC" prefix=$TMPROOT/usr install
}
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann

View File

@ -69,7 +69,7 @@
#
#
SRCPATH=Tools/Utilities
SRCPATH=Tools/Lib
premk() {
echo "Nothing to do for premk()"
@ -78,6 +78,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
@ -91,6 +92,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
$ADDOPTIONS \
--prefix=/usr

View File

@ -76,12 +76,12 @@ SRCPATH=Tools/System
premk() {
echo "Nothing to do for premk()"
# InstallOldKernelh 1
}
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/usr \
--enable-realtime \
@ -101,6 +101,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
$ADDOPTIONS \
--prefix=/usr \

View File

@ -78,6 +78,7 @@ premk() {
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/usr
make -j $NUMCPU
@ -91,6 +92,7 @@ mk() {
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \
$ADDOPTIONS \
--prefix=/usr