lib...-config ist nun ein multiarch_wrapper der abhängig von USE_ARCH
das passende Proggy (-32 oder -64) aufruft git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4686 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
a6125468a1
commit
b41814bef7
@ -83,10 +83,12 @@ premk() {
|
|||||||
mk32() {
|
mk32() {
|
||||||
CC="gcc $BUILDOPTIONS32" \
|
CC="gcc $BUILDOPTIONS32" \
|
||||||
CXX="g++ $BUILDOPTIONS32" \
|
CXX="g++ $BUILDOPTIONS32" \
|
||||||
|
USE_ARCH=$UARCH \
|
||||||
./configure --host=$TARGET32 \
|
./configure --host=$TARGET32 \
|
||||||
--prefix=/usr
|
--prefix=/usr
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
|
mv $TMPROOT/usr/bin/libpng12-config{,-32}
|
||||||
make distclean
|
make distclean
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -97,6 +99,7 @@ mk() {
|
|||||||
fi
|
fi
|
||||||
CC="gcc $BUILDOPTIONS" \
|
CC="gcc $BUILDOPTIONS" \
|
||||||
CXX="g++ $BUILDOPTIONS" \
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
|
USE_ARCH=$UARCH \
|
||||||
./configure --host=$TARGET \
|
./configure --host=$TARGET \
|
||||||
$ADDOPTIONS \
|
$ADDOPTIONS \
|
||||||
--prefix=/usr
|
--prefix=/usr
|
||||||
@ -107,5 +110,9 @@ 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() {
|
||||||
|
if [ "$MK64BIT" == "true" ]; then
|
||||||
|
mv $TMPROOT/usr/bin/libpng12-config{,-64}
|
||||||
|
ln -s multiarch_wrapper $TMPROOT/usr/bin/libpng12-config
|
||||||
|
fi
|
||||||
ln -s libpng12 $TMPROOT/usr/include/libpng
|
ln -s libpng12 $TMPROOT/usr/include/libpng
|
||||||
}
|
}
|
||||||
|
@ -83,6 +83,7 @@ mk32() {
|
|||||||
--disable-build-docs
|
--disable-build-docs
|
||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
|
mv $TMPROOT/usr/bin/libusb-config{,-32}
|
||||||
make distclean
|
make distclean
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -119,5 +120,8 @@ mk() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
postmk() {
|
postmk() {
|
||||||
echo "Nothing to do for postmk()"
|
if [ "$MK64BIT" == "true" ]; then
|
||||||
|
mv $TMPROOT/usr/bin/libusb-config{,-64}
|
||||||
|
ln -s multiarch_wrapper $TMPROOT/usr/bin/libusb-config
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user