Weitere KDE Updates ready
git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6135 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller
parent
fbf8e45069
commit
ae84edb6bb
|
|
@ -96,8 +96,11 @@ mk32() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX= \
|
||||
.. &&
|
||||
find . -type f -exec sed -i "s/lib64/lib/g" {} \;
|
||||
make -j $NUMCPU depend
|
||||
for i in build.make link.txt relink.txt; do
|
||||
find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
|
||||
done
|
||||
|
|
@ -130,6 +133,7 @@ mk() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX=${LIBSUFFIX}\
|
||||
.. &&
|
||||
make -j $NUMCPU
|
||||
|
|
|
|||
|
|
@ -96,8 +96,11 @@ mk32() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX= \
|
||||
.. &&
|
||||
find . -type f -exec sed -i "s/lib64/lib/g" {} \;
|
||||
make -j $NUMCPU depend
|
||||
for i in build.make link.txt relink.txt; do
|
||||
find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
|
||||
done
|
||||
|
|
@ -132,6 +135,7 @@ mk() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX=${LIBSUFFIX}\
|
||||
.. &&
|
||||
sed -i "s%$%-L/usr/$LIBDIR/sasl2 -lgssapiv2 -lgssapi_krb5%" kuser/CMakeFiles/kuser.dir/link.txt
|
||||
|
|
|
|||
|
|
@ -80,22 +80,26 @@ premk() {
|
|||
mk32() {
|
||||
mkdir -v build &&
|
||||
cd build &&
|
||||
QMAKESPEC=linux-g++-32 \
|
||||
USE_ARCH=32 \
|
||||
CC="gcc $BUILDOPTIONS32 -L/opt/kde/lib" \
|
||||
CXX="g++ $BUILDOPTIONS32 -L/opt/kde/lib" \
|
||||
LDEMULATION="elf32_i386" \
|
||||
cmake -DCMAKE_INSTALL_PREFIX=${KDEDIR} \
|
||||
-DSYSCONF_INSTALL_DIR=/etc/kde \
|
||||
-DLIB_INSTALL_DIR=${KDEDIR}/lib \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_C_FLAGS="${BUILDOPTIONS32} -L/opt/kde/lib -L/lib -L/usr/lib -L/usr/X11R7/lib" \
|
||||
-DCMAKE_CXX_FLAGS="${BUILDOPTIONS32} -L/opt/kde/lib -L/lib -L/usr/lib -L/usr/X11R7/lib" \
|
||||
-DX11_LIBRARY=/usr/X11R7/lib \
|
||||
-DXEXT_LIBRARY=/usr/X11R7/lib \
|
||||
-DSAMBA_INCLUDE_DIR=/opt/samba/include \
|
||||
-DSAMBA_LIBRARIES=/opt/samba/lib/libsmbclient.so \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX= \
|
||||
.. &&
|
||||
find . -type f -exec sed -i "s/lib64/lib/g" {} \;
|
||||
make -j $NUMCPU depend
|
||||
make -j $NUMCPU QMAKESPEC=linux-g++-32
|
||||
find . -name "link.txt" -exec sed -i "s/lib64/lib/g" {} \;
|
||||
make -j $NUMCPU
|
||||
make DESTDIR=$TMPROOT install
|
||||
cd ..
|
||||
rm -r build
|
||||
|
|
@ -117,8 +121,6 @@ mk() {
|
|||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_C_FLAGS="${BUILDOPTIONS}" \
|
||||
-DCMAKE_CXX_FLAGS="${BUILDOPTIONS}" \
|
||||
-DX11_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DXEXT_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DSAMBA_INCLUDE_DIR=/opt/samba/include \
|
||||
-DSAMBA_LIBRARIES=/opt/samba/$LIBDIR/libsmbclient.so \
|
||||
-DLIB_SUFFIX=${LIBSUFFIX}\
|
||||
|
|
|
|||
|
|
@ -96,8 +96,11 @@ mk32() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX= \
|
||||
.. &&
|
||||
find . -type f -exec sed -i "s/lib64/lib/g" {} \;
|
||||
make -j $NUMCPU depend
|
||||
for i in build.make link.txt relink.txt; do
|
||||
find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
|
||||
done
|
||||
|
|
@ -132,6 +135,7 @@ mk() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX=${LIBSUFFIX}\
|
||||
.. &&
|
||||
sed -i "s/$/-L \/usr\/X11R7\/$LIBDIR -lGLU/" kalgebra/src/CMakeFiles/kalgebra.dir/link.txt
|
||||
|
|
|
|||
|
|
@ -96,8 +96,11 @@ mk32() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX= \
|
||||
.. &&
|
||||
find . -type f -exec sed -i "s/lib64/lib/g" {} \;
|
||||
make -j $NUMCPU depend
|
||||
for i in build.make link.txt relink.txt; do
|
||||
find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
|
||||
done
|
||||
|
|
@ -136,6 +139,7 @@ mk() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX=${LIBSUFFIX}\
|
||||
.. &&
|
||||
for i in ksudoku/src/CMakeFiles/ksudoku.dir/link.txt \
|
||||
|
|
|
|||
|
|
@ -96,8 +96,11 @@ mk32() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX= \
|
||||
.. &&
|
||||
find . -type f -exec sed -i "s/lib64/lib/g" {} \;
|
||||
make -j $NUMCPU depend
|
||||
for i in build.make link.txt relink.txt; do
|
||||
find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
|
||||
done
|
||||
|
|
@ -130,6 +133,7 @@ mk() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX=${LIBSUFFIX}\
|
||||
.. &&
|
||||
make -j $NUMCPU
|
||||
|
|
|
|||
|
|
@ -96,8 +96,11 @@ mk32() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX= \
|
||||
.. &&
|
||||
find . -type f -exec sed -i "s/lib64/lib/g" {} \;
|
||||
make -j $NUMCPU depend
|
||||
for i in build.make link.txt relink.txt; do
|
||||
find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
|
||||
done
|
||||
|
|
@ -130,6 +133,7 @@ mk() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX=${LIBSUFFIX}\
|
||||
.. &&
|
||||
make -j $NUMCPU
|
||||
|
|
|
|||
|
|
@ -102,8 +102,11 @@ mk32() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX= \
|
||||
.. &&
|
||||
find . -type f -exec sed -i "s/lib64/lib/g" {} \;
|
||||
make -j $NUMCPU depend
|
||||
for i in build.make link.txt relink.txt; do
|
||||
find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
|
||||
done
|
||||
|
|
@ -143,6 +146,7 @@ mk() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX=${LIBSUFFIX}\
|
||||
.. &&
|
||||
make -j $NUMCPU
|
||||
|
|
|
|||
|
|
@ -102,8 +102,11 @@ mk32() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX= \
|
||||
.. &&
|
||||
find . -type f -exec sed -i "s/lib64/lib/g" {} \;
|
||||
make -j $NUMCPU depend
|
||||
for i in build.make link.txt relink.txt; do
|
||||
find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
|
||||
done
|
||||
|
|
@ -141,6 +144,7 @@ mk() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX=${LIBSUFFIX}\
|
||||
.. &&
|
||||
make -j $NUMCPU
|
||||
|
|
|
|||
|
|
@ -96,8 +96,11 @@ mk32() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX= \
|
||||
.. &&
|
||||
find . -type f -exec sed -i "s/lib64/lib/g" {} \;
|
||||
make -j $NUMCPU depend
|
||||
for i in build.make link.txt relink.txt; do
|
||||
find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
|
||||
done
|
||||
|
|
@ -130,6 +133,7 @@ mk() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX=${LIBSUFFIX}\
|
||||
.. &&
|
||||
make -j $NUMCPU
|
||||
|
|
|
|||
|
|
@ -77,37 +77,6 @@ premk() {
|
|||
echo "Nothing do do for premk()"
|
||||
}
|
||||
|
||||
mk32() {
|
||||
mkdir -v build &&
|
||||
cd build &&
|
||||
USE_ARCH=32 \
|
||||
CC="gcc $BUILDOPTIONS32 -L/opt/kde/lib" \
|
||||
CXX="g++ $BUILDOPTIONS32 -L/opt/kde/lib" \
|
||||
LDEMULATION="elf32_i386" \
|
||||
cmake -DCMAKE_INSTALL_PREFIX=${KDEDIR} \
|
||||
-DSYSCONF_INSTALL_DIR=/etc/kde \
|
||||
-DLIB_INSTALL_DIR=${KDEDIR}/lib \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_C_FLAGS="${BUILDOPTIONS32}" \
|
||||
-DCMAKE_CXX_FLAGS="${BUILDOPTIONS32}" \
|
||||
-DX11_LIBRARY=/usr/X11R7/lib \
|
||||
-DXEXT_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_INCLUDE_DIR=/usr/include/GL \
|
||||
-DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DLIB_SUFFIX= \
|
||||
.. &&
|
||||
for i in build.make link.txt relink.txt; do
|
||||
find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
|
||||
done
|
||||
make -j $NUMCPU QMAKESPEC=linux-g++-32
|
||||
find . -name cmake_install.cmake -exec sed -i "s/\/lib64/\/lib/g" {} \;
|
||||
make DESTDIR=$TMPROOT install
|
||||
cd ..
|
||||
rm -r build
|
||||
}
|
||||
|
||||
#Hier wird der Make Prozess der Sourcen definiert
|
||||
mk() {
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
|
|
@ -130,6 +99,7 @@ mk() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX=${LIBSUFFIX}\
|
||||
.. &&
|
||||
make -j $NUMCPU
|
||||
|
|
|
|||
|
|
@ -96,8 +96,11 @@ mk32() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/lib \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX= \
|
||||
.. &&
|
||||
find . -type f -exec sed -i "s/lib64/lib/g" {} \;
|
||||
make -j $NUMCPU depend
|
||||
for i in build.make link.txt relink.txt; do
|
||||
find . -name "*$i" -exec sed -i "s/\/lib64/\/lib/g" {} \;
|
||||
done
|
||||
|
|
@ -130,6 +133,7 @@ mk() {
|
|||
-DOPENGL_gl_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_glu_LIBRARY=/usr/X11R7/$LIBDIR \
|
||||
-DOPENGL_xmesa_INCLUDE_DIR=/usr/X11R7/include/GL \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=YES \
|
||||
-DLIB_SUFFIX=${LIBSUFFIX}\
|
||||
.. &&
|
||||
make -j $NUMCPU
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user