Aenderungen der configure flags, da kde kritische Programme nicht wollten.
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5021 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
750b40647f
commit
7666b209d4
@ -78,51 +78,128 @@ export NoRewriteName=true
|
||||
premk() {
|
||||
QTDIR=`pwd`
|
||||
export QTDIR
|
||||
X11R7_Fix
|
||||
find . -type f -exec sed -i "s/X11R6/X11R7/g" {} \;
|
||||
mkdir ../build-qt
|
||||
cd ../build-qt
|
||||
mkdir -p $TMPROOT/opt/qt-4
|
||||
mkdir -p $TMPROOT/usr/share/doc
|
||||
}
|
||||
|
||||
mk32() {
|
||||
yes "o"| \
|
||||
CC="gcc $BUILDOPTIONS32 -fvisibility=hidden" \
|
||||
CXX="g++ $BUILDOPTIONS32 -fvisibility=hidden" \
|
||||
export QMAKESPEC=linux-g++-32 &&
|
||||
echo -e "o\nyes" |
|
||||
USE_ARCH=$UARCH \
|
||||
../qt-*/configure -prefix /opt/qt-4 \
|
||||
-docdir /usr/share/doc/qt-4 \
|
||||
-platform linux-g++-32 \
|
||||
-libdir /opt/qt-4/lib
|
||||
-plugindir /opt/qt-4/lib/plugins \
|
||||
-headerdir /opt/qt-4/include \
|
||||
-datadir /opt/qt-4/share \
|
||||
-translationdir /opt/qt-4/share/translations \
|
||||
-docdir /opt/qt-4/share/doc/qt \
|
||||
-demosdir /opt/qt-4/share/demos \
|
||||
-examplesdir /opt/qt-4/share/examples \
|
||||
-sysconfdir /etc/qt-4 \
|
||||
-L/usr/lib \
|
||||
-L/usr/X11R7/lib \
|
||||
-qt-gif \
|
||||
-system-zlib \
|
||||
-system-libtiff \
|
||||
-system-libpng \
|
||||
-system-libmng \
|
||||
-system-libjpeg \
|
||||
-openssl \
|
||||
-opengl \
|
||||
-glib \
|
||||
-stl \
|
||||
-reduce-relocations \
|
||||
-plugin-sql-odbc \
|
||||
-plugin-sql-mysql \
|
||||
-plugin-sql-pgsql \
|
||||
-plugin-sql-sqlite \
|
||||
-system-sqlite \
|
||||
-qt3support \
|
||||
-phonon \
|
||||
-phonon-backend \
|
||||
-optimized-qmake \
|
||||
-confirm-license &&
|
||||
-no-separate-debug-info \
|
||||
-release \
|
||||
-confirm-license \
|
||||
-opensource &&
|
||||
make -j $NUMCPU
|
||||
make -j $NUMCPU install
|
||||
cd ../qt-*
|
||||
rm -r ../build-qt
|
||||
mkdir ../build-qt
|
||||
cd ../build-qt
|
||||
tar -C /opt/qt-4 -cf - .|tar -C $TMPROOT/opt/qt-4 -xvf -
|
||||
mv -v $TMPROOT/opt/qt-4/bin/qmake{,-32}
|
||||
mv -v $TMPROOT/opt/qt-4/bin/uic{,-32}
|
||||
mv -v $TMPROOT/opt/qt-4/bin/uic3{,-32}
|
||||
mv -v $TMPROOT/opt/qt-4/bin/moc{,-32}
|
||||
mv -v $TMPROOT/opt/qt-4/include/Qt/qconfig{,-32}.h
|
||||
mv -v $TMPROOT/opt/qt-4/include/QtCore/qconfig{,-32}.h
|
||||
}
|
||||
|
||||
#Hier wird der Make Prozess der Sourcen definiert
|
||||
mk() {
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
ADDOPTIONS="-libdir /opt/qt-4/lib64"
|
||||
export QMAKESPEC=linux-g++-64
|
||||
else
|
||||
export QMAKESPEC=linux-g++-32
|
||||
fi
|
||||
yes "o"| \
|
||||
CC="gcc $BUILDOPTIONS -fvisibility=hidden" \
|
||||
CXX="g++ $BUILDOPTIONS -fvisibility=hidden" \
|
||||
echo -e "o\nyes" |
|
||||
USE_ARCH=$UARCH \
|
||||
../qt-*/configure -prefix /opt/qt-4 \
|
||||
-docdir /usr/share/doc/qt-4 \
|
||||
$ADDOPTIONS \
|
||||
-libdir /opt/qt-4/$LIBDIR \
|
||||
-plugindir /opt/qt-4/$LIBDIR/plugins \
|
||||
-headerdir /opt/qt-4/include \
|
||||
-datadir /opt/qt-4/share \
|
||||
-translationdir /opt/qt-4/share/translations \
|
||||
-docdir /opt/qt-4/share/doc/qt \
|
||||
-demosdir /opt/qt-4/share/demos \
|
||||
-examplesdir /opt/qt-4/share/examples \
|
||||
-sysconfdir /etc/qt-4 \
|
||||
-L/usr/lib64 \
|
||||
-L/usr/X11R7/lib64 \
|
||||
-qt-gif \
|
||||
-system-zlib \
|
||||
-system-libtiff \
|
||||
-system-libpng \
|
||||
-system-libmng \
|
||||
-system-libjpeg \
|
||||
-openssl \
|
||||
-opengl \
|
||||
-glib \
|
||||
-stl \
|
||||
-reduce-relocations \
|
||||
-plugin-sql-odbc \
|
||||
-plugin-sql-mysql \
|
||||
-plugin-sql-pgsql \
|
||||
-plugin-sql-sqlite \
|
||||
-system-sqlite \
|
||||
-qt3support \
|
||||
-phonon \
|
||||
-phonon-backend \
|
||||
-no-separate-debug-info \
|
||||
-optimized-qmake \
|
||||
-confirm-license &&
|
||||
-confirm-license \
|
||||
-release \
|
||||
-confirm-license \
|
||||
-opensource &&
|
||||
make -j $NUMCPU
|
||||
make -j $NUMCPU install
|
||||
tar -C /opt/qt-4 -cf - .|tar -C $TMPROOT/opt/qt-4 -xvf -
|
||||
tar -C /usr/share/doc -cf - qt-4 |tar -C $TMPROOT/usr/share/doc -xvf -
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
mv -v $TMPROOT/opt/qt-4/bin/qmake{,-64}
|
||||
mv -v $TMPROOT/opt/qt-4/bin/uic{,-64}
|
||||
mv -v $TMPROOT/opt/qt-4/bin/uic3{,-64}
|
||||
mv -v $TMPROOT/opt/qt-4/bin/moc{,-64}
|
||||
mv -v $TMPROOT/opt/qt-4/include/Qt/qconfig{,-64}.h
|
||||
mv -v $TMPROOT/opt/qt-4/include/QtCore/qconfig{,-64}.h
|
||||
ln -sfv /usr/bin/multiarch_wrapper $TMPROOT/opt/qt-4/bin/qmake
|
||||
ln -sfv /usr/bin/multiarch_wrapper $TMPROOT/opt/qt-4/bin/uic
|
||||
ln -sfv /usr/bin/multiarch_wrapper $TMPROOT/opt/qt-4/bin/uic3
|
||||
ln -sfv /usr/bin/multiarch_wrapper $TMPROOT/opt/qt-4/bin/moc
|
||||
fi
|
||||
}
|
||||
|
||||
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
|
||||
@ -131,4 +208,38 @@ postmk() {
|
||||
GetSVN Viitor_qt-4 $TMPROOT
|
||||
cd ../qt-*
|
||||
rm -r ../build-qt
|
||||
cat >$TPROOT/opt/qt-4/include/Qt/qconfig.h << "EOF"
|
||||
/* qconfig.h - Stub Header */
|
||||
#ifndef __STUB__QCONFIG_H__
|
||||
#define __STUB__QCONFIG_H__
|
||||
|
||||
#if defined(__x86_64__) || \
|
||||
defined(__sparc64__) || \
|
||||
defined(__arch64__) || \
|
||||
defined(__powerpc64__) || \
|
||||
defined(__s390x__)
|
||||
# include "qconfig-64.h"
|
||||
#else
|
||||
# include "qconfig-32.h"
|
||||
#endif
|
||||
|
||||
#endif /* __STUB_QCONFIG_H__ */
|
||||
EOF
|
||||
cat >$TMPROOT/opt/qt-4/include/QtCore/qconfig.h <<"EOF"
|
||||
/* qconfig.h - Stub Header */
|
||||
#ifndef __STUB__QCONFIG_H__
|
||||
#define __STUB__QCONFIG_H__
|
||||
|
||||
#if defined(__x86_64__) || \
|
||||
defined(__sparc64__) || \
|
||||
defined(__arch64__) || \
|
||||
defined(__powerpc64__) || \
|
||||
defined(__s390x__)
|
||||
# include "qconfig-64.h"
|
||||
#else
|
||||
# include "qconfig-32.h"
|
||||
#endif
|
||||
|
||||
#endif /* __STUB_QCONFIG_H__ */
|
||||
EOF
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user