32 Bit Build funktioniert jetzt korrekt. Libs werden auch alle korrekt angelegt.

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4710 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2009-05-19 12:23:11 +00:00
parent e1636f362c
commit e7855bc3f7

View File

@ -77,30 +77,32 @@ premk() {
} }
mk32() { mk32() {
autoconf
CC="gcc ${BUILDOPTIONS32}" \ CC="gcc ${BUILDOPTIONS32}" \
CXX="g++ ${BUILDOPTIONS32}" \ CXX="g++ ${BUILDOPTIONS32}" \
./configure --host=$TARGET \ USE_ARCH=$UARCH \
./configure --host=$TARGET32 \
--prefix=/ \ --prefix=/ \
--mandir=/usr/share/man \ --mandir=/usr/share/man \
--enable-share-uuid=yes --enable-share-uuid=yes
sed -e "s%LIBTOOL.*$%LIBTOOL = /usr/bin/libtool --tag help%" \ #sed -i -e "s%LIBTOOL.*$%LIBTOOL = /usr/bin/libtool --tag help%" include/builddefs
include/builddefs >/tmp/builddefs make -j $NUMCPU USE_ARCH=$UARCH &&
mv /tmp/builddefs include/builddefs
make -j $NUMCPU &&
make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \
PKG_LIB_DIR=$TMPROOT/usr/lib \ PKG_LIB_DIR=$TMPROOT/usr/lib \
PKG_SBIN_DIR=$TMPROOT/sbin \ PKG_SBIN_DIR=$TMPROOT/sbin \
PKG_SLIB_DIR=$TMPROOT/lib \ PKG_SLIB_DIR=$TMPROOT/lib \
PKG_INC_DIR=$TMPROOT/usr/include/xfs \ PKG_INC_DIR=$TMPROOT/usr/include/xfs \
PKG_MAN_DIR=$TMPROOT/usr/share/man \ PKG_MAN_DIR=$TMPROOT/usr/share/man \
PKG_DOC_DIR=$TMPROOT/usr/doc/xfsprogs install PKG_DOC_DIR=$TMPROOT/usr/doc/xfsprogs \
USE_ARCH=$UARCH install
make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \
PKG_LIB_DIR=$TMPROOT/usr/lib \ PKG_LIB_DIR=$TMPROOT/usr/lib \
PKG_SBIN_DIR=$TMPROOT/sbin \ PKG_SBIN_DIR=$TMPROOT/sbin \
PKG_SLIB_DIR=$TMPROOT/lib \ PKG_SLIB_DIR=$TMPROOT/lib \
PKG_INC_DIR=$TMPROOT/usr/include/xfs \ PKG_INC_DIR=$TMPROOT/usr/include/xfs \
PKG_MAN_DIR=$TMPROOT/usr/share/man \ PKG_MAN_DIR=$TMPROOT/usr/share/man \
PKG_DOC_DIR=$TMPROOT/usr/doc/xfsprogs install-dev PKG_DOC_DIR=$TMPROOT/usr/doc/xfsprogs \
USE_ARCH=$UARCH install-dev
rm $TMPROOT/usr/lib/libhandle.a rm $TMPROOT/usr/lib/libhandle.a
cp libhandle/.libs/libhandle.a $TMPROOT/usr/lib cp libhandle/.libs/libhandle.a $TMPROOT/usr/lib
rm $TMPROOT/usr/lib/libhandle.la rm $TMPROOT/usr/lib/libhandle.la
@ -115,32 +117,36 @@ mk32() {
#Hier wird der Make Prozess der Sourcen definiert #Hier wird der Make Prozess der Sourcen definiert
mk() { mk() {
autoconf
if [ "$MK64BIT" == "true" ]; then if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="--libdir=/usr/lib64" ADDOPTIONS="--libdir=/usr/lib64"
mkdir -p $TMPROOT/usr/lib64 $TMPROOT/lib64 mkdir -p $TMPROOT/usr/lib64 $TMPROOT/lib64
fi fi
CC="gcc ${BUILDOPTIONS}" \ CC="gcc ${BUILDOPTIONS}" \
CXX="g++ ${BUILDOPTIONS}" \ CXX="g++ ${BUILDOPTIONS}" \
USE_ARCH=$UARCH \
./configure --host=$TARGET \ ./configure --host=$TARGET \
--prefix=/ \ --prefix=/ \
$ADDOPTIONS \ $ADDOPTIONS \
--mandir=/usr/share/man \ --mandir=/usr/share/man \
--enable-share-uuid=yes --enable-share-uuid=yes
make -j $NUMCPU && make -j $NUMCPU USE_ARCH=$UARCH &&
make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \
PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \ PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \
PKG_SBIN_DIR=$TMPROOT/sbin \ PKG_SBIN_DIR=$TMPROOT/sbin \
PKG_SLIB_DIR=$TMPROOT/$LIBDIR \ PKG_SLIB_DIR=$TMPROOT/$LIBDIR \
PKG_INC_DIR=$TMPROOT/usr/include/xfs \ PKG_INC_DIR=$TMPROOT/usr/include/xfs \
PKG_MAN_DIR=$TMPROOT/usr/share/man \ PKG_MAN_DIR=$TMPROOT/usr/share/man \
PKG_DOC_DIR=$TMPROOT/usr/doc/xfsprogs install PKG_DOC_DIR=$TMPROOT/usr/doc/xfsprogs \
USE_ARCH=$UARCH install
make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \ make -j $NUMCPU PKG_BIN_DIR=$TMPROOT/usr/bin \
PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \ PKG_LIB_DIR=$TMPROOT/usr/$LIBDIR \
PKG_SBIN_DIR=$TMPROOT/sbin \ PKG_SBIN_DIR=$TMPROOT/sbin \
PKG_SLIB_DIR=$TMPROOT/$LIBDIR \ PKG_SLIB_DIR=$TMPROOT/$LIBDIR \
PKG_INC_DIR=$TMPROOT/usr/include/xfs \ PKG_INC_DIR=$TMPROOT/usr/include/xfs \
PKG_MAN_DIR=$TMPROOT/usr/share/man \ PKG_MAN_DIR=$TMPROOT/usr/share/man \
PKG_DOC_DIR=$TMPROOT/usr/doc/xfsprogs install-dev PKG_DOC_DIR=$TMPROOT/usr/doc/xfsprogs \
USE_ARCH=$UARCH install-dev
rm $TMPROOT/usr/$LIBDIR/libhandle.a rm $TMPROOT/usr/$LIBDIR/libhandle.a
cp libhandle/.libs/libhandle.a $TMPROOT/usr/$LIBDIR cp libhandle/.libs/libhandle.a $TMPROOT/usr/$LIBDIR
rm $TMPROOT/usr/lib/libhandle.la rm $TMPROOT/usr/lib/libhandle.la
@ -152,10 +158,15 @@ mk() {
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
#in $TMPROOT noch einiges korrigieren #in $TMPROOT noch einiges korrigieren
postmk() { postmk() {
rm $TMPROOT/usr/lib/libhandle.a # rm $TMPROOT/usr/lib/libhandle.a
cp libhandle/.libs/libhandle.a $TMPROOT/usr/lib # cp libhandle/.libs/libhandle.a $TMPROOT/usr/lib
rm $TMPROOT/usr/lib/libhandle.la rm $TMPROOT/usr/lib/libhandle.la
sed -e "s%^libdir.*$%libdir=\'/usr/lib\'%" \ sed -e "s%^libdir.*$%libdir=\'/usr/lib\'%" \
libhandle/.libs/libhandle.la >$TMPROOT/usr/lib/libhandle.la libhandle/.libs/libhandle.la >$TMPROOT/usr/lib/libhandle.la
if [ "$MK64BIT" == "true" ]; then
rm $TMPROOT/usr/lib64/libhandle.la
sed -e "s%^ibdir.*$%libdir=\'/usr/lib64\'%" \
libhandle/.libs/libhandle.la >$TMPROOT/usr/lib64/libhandle.la
fi
cp /libexec/{libdisk.a,libxcmd.a,libxfs.a,libxlog.a} $TMPROOT/usr/lib/ cp /libexec/{libdisk.a,libxcmd.a,libxfs.a,libxlog.a} $TMPROOT/usr/lib/
} }