Anpassung an neue Version
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4653 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
b3f7d2a54b
commit
5931538b96
@ -81,7 +81,7 @@ premk() {
|
||||
|
||||
mk() {
|
||||
# Make-Optionen eintragen
|
||||
perl Makefile.PL prefix=$TMPROOT/usr
|
||||
perl Makefile.PL prefix=$TMPROOT/usr EXPATLIBPATH=/usr/lib EXPATINCPATH=/usr/include
|
||||
make -j $NUMCPU
|
||||
CheckError "Makeprocess failed !" 1
|
||||
|
||||
|
@ -83,12 +83,13 @@ premk() {
|
||||
mk32() {
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET32 \
|
||||
--prefix=/usr/X11R7 &&
|
||||
cp /usr/bin/libtool .
|
||||
sed -i "s%/libtool%/libtool --tag help%" Makefile
|
||||
# cp /usr/bin/libtool .
|
||||
# sed -i "s%/libtool%/libtool --tag help%" Makefile
|
||||
make &&
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
make DESTDIR=$TMPROOT install
|
||||
CheckError "Make install process failed !" 1
|
||||
make distclean
|
||||
}
|
||||
@ -99,11 +100,12 @@ mk() {
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET \
|
||||
$ADDOPTIONS \
|
||||
--prefix=/usr/X11R7 &&
|
||||
cp /usr/bin/libtool .
|
||||
sed -i "s%/libtool%/libtool --tag help%" Makefile
|
||||
# cp /usr/bin/libtool .
|
||||
# sed -i "s%/libtool%/libtool --tag help%" Makefile
|
||||
make &&
|
||||
make DESTDIR=$TMPROOT install
|
||||
CheckError "Make install process failed !" 1
|
||||
|
@ -83,12 +83,13 @@ premk() {
|
||||
mk32() {
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET32 \
|
||||
--prefix=/usr \
|
||||
--with-gnu-ld \
|
||||
--without-python &&
|
||||
make -k -j $NUMCPU
|
||||
make -k -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
make -j $NUMCPU
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
make distclean
|
||||
}
|
||||
|
||||
@ -99,6 +100,7 @@ mk() {
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET \
|
||||
--prefix=/usr \
|
||||
$ADDOPTIONS \
|
||||
|
Loading…
Reference in New Issue
Block a user