Anpassung an V963, Einarbeitung der neuesten CLFS Version
git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6016 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
0f0351dc6a
commit
66e6e3f8f9
|
@ -90,8 +90,9 @@ mk32() {
|
|||
--libdir=/lib \
|
||||
--with-shared \
|
||||
--without-debug \
|
||||
--enable-widec
|
||||
make
|
||||
--enable-widec \
|
||||
--with-manpage-format=normal
|
||||
make -j $NUMCPU
|
||||
make install
|
||||
make DESTDIR=$TMPROOT install
|
||||
mv -v /usr/bin/ncursesw5-config{,-32}
|
||||
|
@ -103,19 +104,15 @@ mk32() {
|
|||
}
|
||||
|
||||
mk() {
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
ADDOPTIONS="--libdir=/lib64"
|
||||
else
|
||||
ADDOPTIONS="--libdir=/lib"
|
||||
fi
|
||||
CC="gcc ${BUILDOPTIONS} -fPIC" \
|
||||
CXX="g++ ${BUILDOPTIONS} -fPIC" \
|
||||
../ncurses*/configure --prefix=/usr \
|
||||
$ADDOPTIONS \
|
||||
--libdir=/${LIBDIR} \
|
||||
--with-shared \
|
||||
--without-debug \
|
||||
--enable-widec
|
||||
make
|
||||
--enable-widec \
|
||||
--with-manpage-format=normal
|
||||
make -j $NUMCPU
|
||||
make install
|
||||
make DESTDIR=$TMPROOT install
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
|
@ -148,7 +145,6 @@ postmk() {
|
|||
ln -sfv libncursesw.a /usr/lib/libcursesw.a
|
||||
ln -sfv libncurses.a /usr/lib/libcurses.a
|
||||
ln -sfv libncurses++w.a /usr/lib/libncurses++.a
|
||||
#ln -sfv ncursesw5-config-32 /usr/bin/ncurses5-config-32
|
||||
ln -sfv ../../usr/share/terminfo /usr/lib/terminfo
|
||||
#korrekt the files in $TMPROOT for 32 bit
|
||||
mv -v $TMPROOT/lib/lib{panelw,menuw,formw,ncursesw,ncurses++w}.a $TMPROOT/usr/lib
|
||||
|
@ -166,7 +162,6 @@ postmk() {
|
|||
ln -sfv libncursesw.a $TMPROOT/usr/lib/libcursesw.a
|
||||
ln -sfv libncurses.a $TMPROOT/usr/lib/libcurses.a
|
||||
ln -sfv libncurses++w.a $TMPROOT/usr/lib/libncurses++.a
|
||||
#ln -sfv ncursesw5-config-32 $TMPROOT/usr/bin/ncurses5-config-32
|
||||
ln -sfv ../../usr/share/terminfo $TMPROOT/usr/lib/terminfo
|
||||
if [ $MK64BIT == "true" ]; then
|
||||
#Korrekt the files in Build System for 64 Bit
|
||||
|
|
Loading…
Reference in New Issue
Block a user