Diverse Korrekturen in der installation. ptlib-config-64 funktioniert jetzt korrekt.
die libs fuer 64bit liegen nicht mehr unter /lib64 sondern unter /usr/lib64... git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6068 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
7e5cb9f62f
commit
62a86c58ec
|
@ -116,7 +116,7 @@ mk32() {
|
||||||
}
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
sed -i -e "s:/share/pwlib:/lib/pwlib:g" Makefile.in
|
sed -i -e "s:/share/pwlib:/${LIBDIR}/pwlib:g" Makefile.in
|
||||||
CC="gcc $BUILDOPTIONS" \
|
CC="gcc $BUILDOPTIONS" \
|
||||||
CXX="g++ $BUILDOPTIONS" \
|
CXX="g++ $BUILDOPTIONS" \
|
||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
|
@ -127,7 +127,7 @@ mk() {
|
||||||
--enable-v4l2 \
|
--enable-v4l2 \
|
||||||
--enable-alsa \
|
--enable-alsa \
|
||||||
--enable-oss \
|
--enable-oss \
|
||||||
--libdir=\${prefix}/${LIBDIR} \
|
--libdir=/usr/${LIBDIR} \
|
||||||
--prefix=/usr
|
--prefix=/usr
|
||||||
touch $TARGET
|
touch $TARGET
|
||||||
unset TARGET
|
unset TARGET
|
||||||
|
@ -141,8 +141,7 @@ postmk() {
|
||||||
tar -C $TMPROOT/usr/lib -cf - .| tar -C $TMPROOT/usr/lib64 -xvf -
|
tar -C $TMPROOT/usr/lib -cf - .| tar -C $TMPROOT/usr/lib64 -xvf -
|
||||||
rm -r $TMPROOT/usr/lib
|
rm -r $TMPROOT/usr/lib
|
||||||
mv $TMPROOT/usr/lib32 $TMPROOT/usr/lib
|
mv $TMPROOT/usr/lib32 $TMPROOT/usr/lib
|
||||||
rm $TMPROOT/usr/bin/ptlib-config
|
mv $TMPROOT/usr/bin/ptlib-config{,-64}
|
||||||
ln -sf ../lib64/pwlib/make/ptlib-config $TMPROOT/usr/bin/ptlib-config-64
|
|
||||||
ln -sf multiarch_wrapper $TMPROOT/usr/bin/ptlib-config
|
ln -sf multiarch_wrapper $TMPROOT/usr/bin/ptlib-config
|
||||||
mv -v $TMPROOT/usr/include/ptbuildopts{,-64}.h
|
mv -v $TMPROOT/usr/include/ptbuildopts{,-64}.h
|
||||||
cat > $TMPROOT/usr/include/ptbuildopts.h << "EOF"
|
cat > $TMPROOT/usr/include/ptbuildopts.h << "EOF"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user