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