Anpassungen an 1.18. Verkuerzung des 32 Builds.

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4517 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2008-05-29 11:10:38 +00:00
parent 691e9d8d97
commit 1586d24855

View File

@ -68,6 +68,7 @@
#Version der Datei: $Revision$ #Version der Datei: $Revision$
# #
(( MKPKG = $MKPKG | 128 ))
SRCPATH=Base/System SRCPATH=Base/System
premk() { premk() {
@ -76,40 +77,23 @@ premk() {
} }
mk32() { mk32() {
make -j $NUMCPU \ cd extras/volume_id/lib
CC="gcc ${BUILDOPTIONS32}" \ make -j $NUMCPU CC="gcc ${BUILDOPTIONS32}" \
EXTRAS="extras/ata_id \ AR=ar \
extras/cdrom_id \ RANLIB=ranlib \
extras/edd_id \ E=@echo \
extras/firmware \ Q=@ \
extras/floppy \ LDFLAGS="-m32"
extras/path_id \ make DESTDIR=$TMPROOT install
extras/rule_generator \ cd $MAKEDIR/udev*
extras/scsi_id \
extras/usb_id \
extras/volume_id" \
LDFLAGS="-m32" \
udevdir=/dev
make DESTDIR=$TMPROOT \
CC="gcc ${BUILDOPTIONS32}" \
EXTRAS="extras/ata_id \
extras/cdrom_id \
extras/edd_id \
extras/firmware \
extras/floppy \
extras/path_id \
extras/rule_generator \
extras/scsi_id \
extras/usb_id \
extras/volume_id" \
udevdir=/dev install
make clean make clean
mv $TMPROOT/lib $TMPROOT/lib32 echo "32 Bit build ready"
read
} }
mk() { mk() {
if [ "$MK64BIT" == "true" ];then if [ "$MK64BIT" == "true" ];then
SrcPatch $MAKEDIR/udev* $LFSSOURCE/$SRCPATH/udev-*-lib64-1.patch*
LIBDIR=lib64 LIBDIR=lib64
else else
LIBDIR=lib LIBDIR=lib
@ -119,6 +103,7 @@ mk() {
libudevdir=\${prefix}/$LIBDIR/udev \ libudevdir=\${prefix}/$LIBDIR/udev \
EXTRAS="extras/ata_id \ EXTRAS="extras/ata_id \
extras/cdrom_id \ extras/cdrom_id \
extras/collect \
extras/edd_id \ extras/edd_id \
extras/firmware \ extras/firmware \
extras/floppy \ extras/floppy \
@ -132,6 +117,7 @@ mk() {
make DESTDIR=$TMPROOT \ make DESTDIR=$TMPROOT \
EXTRAS="extras/ata_id \ EXTRAS="extras/ata_id \
extras/cdrom_id \ extras/cdrom_id \
extras/collect \
extras/edd_id \ extras/edd_id \
extras/firmware \ extras/firmware \
extras/floppy \ extras/floppy \
@ -145,8 +131,6 @@ mk() {
postmk() { postmk() {
if [ "$MK64BIT" == "true" ]; then if [ "$MK64BIT" == "true" ]; then
mv $TMPROOT/lib $TMPROOT/lib64
mv $TMPROOT/lib32 $TMPROOT/lib
ln ../lib64/udev $TMPROOT/lib/udev ln ../lib64/udev $TMPROOT/lib/udev
LIBDIR=lib64 LIBDIR=lib64
mkdir -p $TMPROOT/usr/lib64/pkgconfig mkdir -p $TMPROOT/usr/lib64/pkgconfig