korrektur bei dem multiarch_wrapper tricksereien
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5663 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
dedee38c67
commit
b7f7a35bb9
@ -94,9 +94,8 @@ mk32() {
|
|||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
make DESTDIR=$TMPROOT install
|
make DESTDIR=$TMPROOT install
|
||||||
mv -v $TMPROOT/usr/bin/ncurses5-config{,-32}
|
mv -v /usr/bin/ncursesw5-config{,-32}
|
||||||
mv -v /usr/bin/ncurses5-config{,-32}
|
mv -v $TMPROOT/usr/bin/ncursesw5-config{,-32}
|
||||||
mv -v $TMPROOT/usr/bin/ ncursesw5-config{,-32}
|
|
||||||
cd ../ncurses*
|
cd ../ncurses*
|
||||||
rm -r ../build-ncurses
|
rm -r ../build-ncurses
|
||||||
mkdir ../build-ncurses
|
mkdir ../build-ncurses
|
||||||
@ -121,9 +120,14 @@ mk() {
|
|||||||
make DESTDIR=$TMPROOT install
|
make DESTDIR=$TMPROOT install
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
if [ "$MK64BIT" == "true" ]; then
|
||||||
mv -v /usr/bin/ncursesw5-config{,-64}
|
mv -v /usr/bin/ncursesw5-config{,-64}
|
||||||
ln -svf multiarch_wrapper /usr/bin/ncursesw5-config
|
|
||||||
mv -v $TMPROOT/usr/bin/ncursesw5-config{,-64}
|
mv -v $TMPROOT/usr/bin/ncursesw5-config{,-64}
|
||||||
|
ln -svf ncursesw5-config-32 $TMPROOT/usr/bin/ncurses5-config-32
|
||||||
|
ln -svf ncursesw5-config-64 $TMPROOT/usr/bin/ncurses5-config-64
|
||||||
|
ln -svf multiarch_wrapper /usr/bin/ncursesw5-config
|
||||||
|
ln -svf multiarch_wrapper $TMPROOT/usr/bin/ncurses5-config
|
||||||
ln -svf multiarch_wrapper $TMPROOT/usr/bin/ncursesw5-config
|
ln -svf multiarch_wrapper $TMPROOT/usr/bin/ncursesw5-config
|
||||||
|
else
|
||||||
|
ln -svf ncureses5-config $TMPROOT/usr/bin/ncursesw5-config
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -144,7 +148,7 @@ postmk() {
|
|||||||
ln -sfv libncursesw.a /usr/lib/libcursesw.a
|
ln -sfv libncursesw.a /usr/lib/libcursesw.a
|
||||||
ln -sfv libncurses.a /usr/lib/libcurses.a
|
ln -sfv libncurses.a /usr/lib/libcurses.a
|
||||||
ln -sfv libncurses++w.a /usr/lib/libncurses++.a
|
ln -sfv libncurses++w.a /usr/lib/libncurses++.a
|
||||||
ln -sfv ncursesw5-config-32 /usr/bin/ncurses5-config-32
|
#ln -sfv ncursesw5-config-32 /usr/bin/ncurses5-config-32
|
||||||
ln -sfv ../../usr/share/terminfo /usr/lib/terminfo
|
ln -sfv ../../usr/share/terminfo /usr/lib/terminfo
|
||||||
#korrekt the files in $TMPROOT for 32 bit
|
#korrekt the files in $TMPROOT for 32 bit
|
||||||
mv -v $TMPROOT/lib/lib{panelw,menuw,formw,ncursesw,ncurses++w}.a $TMPROOT/usr/lib
|
mv -v $TMPROOT/lib/lib{panelw,menuw,formw,ncursesw,ncurses++w}.a $TMPROOT/usr/lib
|
||||||
@ -162,7 +166,7 @@ postmk() {
|
|||||||
ln -sfv libncursesw.a $TMPROOT/usr/lib/libcursesw.a
|
ln -sfv libncursesw.a $TMPROOT/usr/lib/libcursesw.a
|
||||||
ln -sfv libncurses.a $TMPROOT/usr/lib/libcurses.a
|
ln -sfv libncurses.a $TMPROOT/usr/lib/libcurses.a
|
||||||
ln -sfv libncurses++w.a $TMPROOT/usr/lib/libncurses++.a
|
ln -sfv libncurses++w.a $TMPROOT/usr/lib/libncurses++.a
|
||||||
ln -sfv ncursesw5-config-32 $TMPROOT/usr/bin/ncurses5-config-32
|
#ln -sfv ncursesw5-config-32 $TMPROOT/usr/bin/ncurses5-config-32
|
||||||
ln -sfv ../../usr/share/terminfo $TMPROOT/usr/lib/terminfo
|
ln -sfv ../../usr/share/terminfo $TMPROOT/usr/lib/terminfo
|
||||||
if [ $MK64BIT == "true" ]; then
|
if [ $MK64BIT == "true" ]; then
|
||||||
#Korrekt the files in Build System for 64 Bit
|
#Korrekt the files in Build System for 64 Bit
|
||||||
@ -182,8 +186,8 @@ postmk() {
|
|||||||
ln -sfv libncursesw.a /usr/lib64/libcursesw.a
|
ln -sfv libncursesw.a /usr/lib64/libcursesw.a
|
||||||
ln -sfv libncurses.a /usr/lib64/libcurses.a
|
ln -sfv libncurses.a /usr/lib64/libcurses.a
|
||||||
ln -sfv libncurses++w.a /usr/lib64/libncurses++.a
|
ln -sfv libncurses++w.a /usr/lib64/libncurses++.a
|
||||||
ln -sfv ncursesw5-config-64 /usr/bin/ncurses5-config-64
|
#ln -sfv ncursesw5-config-64 /usr/bin/ncurses5-config-64
|
||||||
ln -sfv ncursesw5-config /usr/bin/ncurses5-config
|
#ln -sfv ncursesw5-config /usr/bin/ncurses5-config
|
||||||
ln -sfv ../../usr/share/terminfo /usr/lib64/terminfo
|
ln -sfv ../../usr/share/terminfo /usr/lib64/terminfo
|
||||||
#Korrekt the files in $TMPROOT for 64 Bit
|
#Korrekt the files in $TMPROOT for 64 Bit
|
||||||
mv -v $TMPROOT/lib64/lib{panelw,menuw,formw,ncursesw,ncurses++w}.a $TMPROOT/usr/lib64
|
mv -v $TMPROOT/lib64/lib{panelw,menuw,formw,ncursesw,ncurses++w}.a $TMPROOT/usr/lib64
|
||||||
@ -202,8 +206,8 @@ postmk() {
|
|||||||
ln -sfv libncursesw.a $TMPROOT/usr/lib64/libcursesw.a
|
ln -sfv libncursesw.a $TMPROOT/usr/lib64/libcursesw.a
|
||||||
ln -sfv libncurses.a $TMPROOT/usr/lib64/libcurses.a
|
ln -sfv libncurses.a $TMPROOT/usr/lib64/libcurses.a
|
||||||
ln -sfv libncurses++w.a $TMPROOT/usr/lib64/libncurses++.a
|
ln -sfv libncurses++w.a $TMPROOT/usr/lib64/libncurses++.a
|
||||||
ln -sfv ncursesw5-config-64 $TMPROOT/usr/bin/ncurses5-config-64
|
#ln -sfv ncursesw5-config-64 $TMPROOT/usr/bin/ncurses5-config-64
|
||||||
ln -sfv ncursesw5-config $TMPROOT/usr/bin/ncurses5-config
|
#ln -sfv ncursesw5-config $TMPROOT/usr/bin/ncurses5-config
|
||||||
ln -sfv ../../usr/share/terminfo $TMPROOT/usr/lib64/terminfo
|
ln -sfv ../../usr/share/terminfo $TMPROOT/usr/lib64/terminfo
|
||||||
fi
|
fi
|
||||||
cd ../ncurses*
|
cd ../ncurses*
|
||||||
|
Loading…
Reference in New Issue
Block a user