CompuExtreme/ViitorMake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Anpassung an neue Version

Browse Source 
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4566 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2009-03-28 10:20:23 +00:00
parent 3ea63d179a
commit bed045f083
4 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BaseBuild/Basesys/autoconf
View File

@ -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
}

4
BaseBuild/Basesys/automake
View File

@ -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
}

10
BaseBuild/Basesys/bash
View File

@ -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
}

48
BaseBuild/Basesys/readline
View File

@ -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