Und wieder ein paar packages am funktionieren.
Und ein BugFix in ptlib... git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4824 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller
parent
58adb44400
commit
4d5e466155
@ -23,11 +23,11 @@
|
||||
0 guibased/gtk+-2
|
||||
0 guibased/lesstif
|
||||
0 guibased/efltk
|
||||
0 dbase/unixODBC
|
||||
1 dbase/unixODBC
|
||||
0 guibased/qt-all-opensource
|
||||
|
||||
0 xsys/unixODBC
|
||||
6 dbase/unixODBC
|
||||
0 xsys/wxGTK
|
||||
|
||||
0 guibased/opal
|
||||
0 xsys/libglade
|
||||
0 xsys/libwnck
|
||||
|
||||
@ -77,12 +77,15 @@ premk() {
|
||||
else
|
||||
GUIOPTIONS="--enable-gui"
|
||||
fi
|
||||
for i in `find . -name "*.cpp" -exec grep -l "moc from 4.3.2" {} \;`; do
|
||||
sed -i -e "s/\(elif Q_MOC_OUTPUT_REVISION \)!=/\1</" $i
|
||||
done
|
||||
}
|
||||
|
||||
mk32() {
|
||||
export QTDIR=`echo $QTDIR|sed -e "s/lib64/lib/"`
|
||||
CC="gcc $BUILDOPTIONS32 -fPIC" \
|
||||
CXX="g++ $BUILDOPTIONS32 -fPIC" \
|
||||
LDFLAGS="-L/opt/qt-4/lib" \
|
||||
./configure --target=$TARGET32 \
|
||||
--prefix=/usr \
|
||||
$GUIOPTIONS \
|
||||
@ -106,6 +109,7 @@ mk() {
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS -fPIC" \
|
||||
CXX="g++ $BUILDOPTIONS -fPIC" \
|
||||
LDFLAGS="-L/opt/qt-4/lib64" \
|
||||
./configure --target=$TARGET \
|
||||
--prefix=/usr \
|
||||
$ADDOPTIONS \
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
#
|
||||
|
||||
#Pfad zu Basis Source Tree eintragen!
|
||||
SRCPATH=X11/lib
|
||||
SRCPATH=GuiBased/Lib
|
||||
|
||||
#Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
|
||||
#ausgeführt (sprich unpack src; cd src; premk)
|
||||
@ -84,14 +84,21 @@ premk() {
|
||||
mk32() {
|
||||
CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
USE_ARCH=$UARCH \
|
||||
LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \
|
||||
./configure --target=$TARGET32 \
|
||||
--prefix=/usr/X11R7 \
|
||||
--with-odbc \
|
||||
--with-sdl &&
|
||||
--with-sdl \
|
||||
--enable-compat24 \
|
||||
--enable-threads \
|
||||
--without-odbc &&
|
||||
make -j $NUMCPU &&
|
||||
make -j $NUMCPU prefix=$TMPROOT/usr/X11R7 install
|
||||
make distclean
|
||||
LINKDEST=`/bin/ls -l $TMPROOT/usr/X11R7/bin/wx-config | awk '{ print $11; }' | sed -e "s/\/usr\/tmpinstsys\/.*\/usr/\/usr/g"`
|
||||
rm $TMPROOT/usr/X11R7/bin/wx-config
|
||||
ln -s $LINKDEST $TMPROOT/usr/X11R7/bin/wx-config
|
||||
mv $TMPROOT/usr/X11R7/bin/wx-config{,-32}
|
||||
}
|
||||
|
||||
#Hier wird der Make Prozess der Sourcen definiert
|
||||
@ -101,20 +108,26 @@ mk() {
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET \
|
||||
--prefix=/usr/X11R7 \
|
||||
$ADDOPTIONS \
|
||||
--with-odbc \
|
||||
--with-sdl &&
|
||||
--with-sdl \
|
||||
--enable-compat24 \
|
||||
--enable-threads \
|
||||
--without-odbc &&
|
||||
make -j $NUMCPU &&
|
||||
make -j $NUMCPU prefix=$TMPROOT/usr/X11R7 install
|
||||
LINKDEST=`/bin/ls -l $TMPROOT/usr/X11R7/bin/wx-config | awk '{ print $11; }' | sed -e "s/\/usr\/tmpinstsys\/.*\/usr/\/usr/g"`
|
||||
rm $TMPROOT/usr/X11R7/bin/wx-config
|
||||
ln -s $LINKDEST $TMPROOT/usr/X11R7/bin/wx-config
|
||||
}
|
||||
|
||||
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
|
||||
#in $TMPROOT noch einiges korrigieren
|
||||
postmk() {
|
||||
# Linkbug in wx-config
|
||||
LINKDEST=`/bin/ls -l $TMPROOT/usr/X11R7/bin/wx-config | awk '{ print $11; }' | sed -e "s/\/usr\/tmpinstsys\/.*\/usr/\/usr/g"`
|
||||
rm $TMPROOT/usr/X11R7/bin/wx-config
|
||||
ln -s $LINKDEST $TMPROOT/usr/X11R7/bin/wx-config
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
mv $TMPROOT/usr/X11R7/bin/wx-config{,-64}
|
||||
ln -s /usr/bin/multiarch_wrapper $TMPROOT/usr/X11R7/bin/wx-config
|
||||
fi
|
||||
}
|
||||
@ -104,7 +104,9 @@ mk32() {
|
||||
make -k -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
chmod -v 755 $TMPROOT/usr/lib/libpt_linux*so*
|
||||
mv $TMPROOT/usr/bin/ptlib-config{,-32}
|
||||
sed -i -e "s/lib64/lib" $TMPROOT/usr/bin/ptlib-config-32
|
||||
mv $TMPROOT/usr/include/ptbuildopts{,-32}.h
|
||||
mv $TMPROOT/usr/lib $TMPROOT/usr/lib32
|
||||
cd ..
|
||||
rm -r ptlib*
|
||||
UnPack $MAKEDIR $LFSSOURCE/$SRCPATH/ptlib-*-src.tar.gz
|
||||
@ -132,6 +134,11 @@ mk() {
|
||||
make -k -j $NUMCPU CXX="g++ $BUILDOPTIONS" CC="gcc $BUILDOPTIONS"
|
||||
make -k -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
chmod -v 755 $TMPROOT/usr/$LIBDIR/libpt_linux*so*
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
tar -C $TMPROOT/usr/lib -xvf - .| tar -C $TMPROOT/usr/lib64 -xvf -
|
||||
rm -r $TMPROOT/usr/lib
|
||||
mv $TMPROOT/usr/lib32 $TMPROOT/usr/lib
|
||||
fi
|
||||
}
|
||||
|
||||
postmk() {
|
||||
|
||||
@ -84,7 +84,7 @@ mk32() {
|
||||
CXX="g++ $BUILDOPTIONS32" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET32 \
|
||||
--prefix=/opt/gnome &&
|
||||
--prefix=/usr/X11R7 &&
|
||||
make -j $NUMCPU &&
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
CheckError "Make install process failed !" 1
|
||||
@ -93,21 +93,21 @@ mk32() {
|
||||
|
||||
mk() {
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
ADDOPTIONS="--libdir=/opt/gnome/lib64"
|
||||
ADDOPTIONS="--libdir=/usr/X11R7/lib64"
|
||||
fi
|
||||
CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET \
|
||||
$ADDOPTIONS \
|
||||
--prefix=/opt/gnome &&
|
||||
--prefix=/usr/X11R7 &&
|
||||
make -j $NUMCPU &&
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
CheckError "Make install process failed !" 1
|
||||
}
|
||||
|
||||
postmk() {
|
||||
cd $TMPROOT/opt/gnome/lib
|
||||
cd $TMPROOT/usr/X11R7/lib
|
||||
ln -s libatk-*.so.?.* libatk.so
|
||||
cd -
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user