Korrektur in if schleife in postmk(). Abschliessendes fi vergessen
git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6003 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
28ea1c0902
commit
c17a7b7f20
@ -93,15 +93,13 @@ mk32() {
|
|||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
CheckError "Makeprocess failed !" 1
|
CheckError "Makeprocess failed !" 1
|
||||||
|
|
||||||
MakeCheck check
|
MakeCheck -j $NUMCPU check
|
||||||
# Make install Optionen eintragen
|
# Make install Optionen eintragen
|
||||||
make -j $NUMCPU install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
CheckError "Make install process failed !" 1
|
CheckError "Make install process failed !" 1
|
||||||
mv -v /usr/bin/ppl-config{,-32}
|
mv -v $TMPROOT/usr/bin/ppl-config{,-32}
|
||||||
mv -v /usr/include/ppl{,-32}.hh
|
mv -v $TMPROOT/usr/include/ppl{,-32}.hh
|
||||||
make distclean
|
make distclean
|
||||||
echo "Cleaned up"
|
|
||||||
read
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
@ -119,18 +117,18 @@ mk() {
|
|||||||
make -j $NUMCPU
|
make -j $NUMCPU
|
||||||
CheckError "Makeprocess failed !" 1
|
CheckError "Makeprocess failed !" 1
|
||||||
|
|
||||||
MakeCheck check
|
MakeCheck -j $NUMCPU check
|
||||||
# Make install Optionen eintragen
|
# Make install Optionen eintragen
|
||||||
make -j $NUMCPU install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
CheckError "Make install process failed !" 1
|
CheckError "Make install process failed !" 1
|
||||||
}
|
}
|
||||||
|
|
||||||
postmk() {
|
postmk() {
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
if [ "$MK64BIT" == "true" ]; then
|
||||||
mv -v /usr/bin/ppl-config{,-64}
|
mv -v $TMPROOT/usr/bin/ppl-config{,-64}
|
||||||
ln -svf multiarch_wrapper /usr/bin/ppl-config
|
ln -svf multiarch_wrapper $TMPROOT/usr/bin/ppl-config
|
||||||
mv -v /usr/include/ppl{,-64}.hh
|
mv -v $TMPROOT/usr/include/ppl{,-64}.hh
|
||||||
cat > /usr/include/ppl.hh << "EOF"
|
cat > $TMPROOT/usr/include/ppl.hh << "EOF"
|
||||||
/* ppl.hh - Stub Header */
|
/* ppl.hh - Stub Header */
|
||||||
#ifndef __STUB__PPL_HH__
|
#ifndef __STUB__PPL_HH__
|
||||||
#define __STUB__PPL_HH__
|
#define __STUB__PPL_HH__
|
||||||
@ -147,4 +145,5 @@ postmk() {
|
|||||||
|
|
||||||
#endif /* __STUB__PPL_HH__ */
|
#endif /* __STUB__PPL_HH__ */
|
||||||
EOF
|
EOF
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user