Viele Zusätzliche flags, und bearbeitung der linkoptions durch sed verhelfen auf akonadi zu einwandfreiem compilieren
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5040 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
e7b909ea57
commit
1aefb2817d
@ -89,11 +89,25 @@ mk32() {
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_C_FLAGS="${BUILDOPTIONS32}" \
|
||||
-DCMAKE_CXX_FLAGS="${BUILDOPTIONS32}" \
|
||||
-DBoost_INCLUDE_DIR="/usr/include/boost-1-39" \
|
||||
-DMYSQLD_EXECUTABLE=/opt/MySQL/sbin/mysqld \
|
||||
-DLIB_SUFFIX= \
|
||||
-DBOOST_ROOT=/usr \
|
||||
-DBOOST_INCLUDEDIR=/usr/include/boost \
|
||||
-DBOOST_LIBRARYDIR=/usr/lib \
|
||||
-DBoost_PROGRAM_OPTIONS_LIBRARY_DEBUG=/usr/lib \
|
||||
-DBoost_PROGRAM_OPTIONS_LIBRARY_RELEASE=/usr/lib \
|
||||
.. &&
|
||||
for i in server/control/CMakeFiles/akonadi_control.dir/link.txt \
|
||||
server/tests/unittest/CMakeFiles/scopetest.dir/link.txt \
|
||||
server/tests/unittest/CMakeFiles/handlertest.dir/link.txt \
|
||||
server/tests/unittest/CMakeFiles/imapstreamparsertest.dir/link.txt \
|
||||
server/akonadictl/CMakeFiles/akonadictl.dir/link.txt \
|
||||
server/CMakeFiles/akonadiserver_bin.dir/link.txt; do
|
||||
sed -i "s/\(^.*$\)/\1 -lboost_program_options-gcc43-mt/" $i
|
||||
done
|
||||
make -j 8
|
||||
make -j 8
|
||||
find . -name "relink.txt" -exec sed -i "s/\(^.*$\)/\1 -lboost_program_options-gcc43-mt/" {} \;
|
||||
make -j 8 DESTDIR=$TMPROOT install
|
||||
cd ..
|
||||
rm -r build
|
||||
}
|
||||
@ -101,17 +115,32 @@ mk32() {
|
||||
mk() {
|
||||
mkdir -v build &&
|
||||
cd build &&
|
||||
USE_ARCH=64 PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
|
||||
USE_ARCH=64 \
|
||||
cmake -DCMAKE_INSTALL_PREFIX=${KDEDIR} \
|
||||
-DSYSCONF_INSTALL_DIR=/etc/kde \
|
||||
-DLIB_INSTALL_DIR=${KDEDIR}/$LIBDIR \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_C_FLAGS="${BUILDOPTIONS64}" \
|
||||
-DCMAKE_CXX_FLAGS="${BUILDOPTIONS64}" \
|
||||
-DBoost_INCLUDE_DIR="/usr/include/boost-1-39" \
|
||||
-DCMAKE_C_FLAGS="${BUILDOPTIONS}" \
|
||||
-DCMAKE_CXX_FLAGS="${BUILDOPTIONS}" \
|
||||
-DBoost_INCLUDE_DIR="/usr/include/boost" \
|
||||
-DMYSQLD_EXECUTABLE=/opt/MySQL/sbin/mysqld \
|
||||
-DLIB_SUFFIX=64 \
|
||||
-DBOOST_ROOT=/usr \
|
||||
-DBOOST_INCLUDEDIR=/usr/include/boost \
|
||||
-DBOOST_LIBRARYDIR=/usr/$LIBDIR \
|
||||
-DBoost_PROGRAM_OPTIONS_LIBRARY_DEBUG=/usr/$LIBDIR \
|
||||
-DBoost_PROGRAM_OPTIONS_LIBRARY_RELEASE=/usr/$LIBDIR \
|
||||
.. &&
|
||||
for i in server/control/CMakeFiles/akonadi_control.dir/link.txt \
|
||||
server/tests/unittest/CMakeFiles/scopetest.dir/link.txt \
|
||||
server/tests/unittest/CMakeFiles/handlertest.dir/link.txt \
|
||||
server/tests/unittest/CMakeFiles/imapstreamparsertest.dir/link.txt \
|
||||
server/akonadictl/CMakeFiles/akonadictl.dir/link.txt \
|
||||
server/CMakeFiles/akonadiserver_bin.dir/link.txt; do
|
||||
sed -i "s/\(^.*$\)/\1 -lboost_program_options-gcc43-mt/" $i
|
||||
done
|
||||
make -j 8
|
||||
find . -name "relink.txt" -exec sed -i "s/\(^.*$\)/\1 -lboost_program_options-gcc43-mt/" {} \;
|
||||
make -j 8 DESTDIR=$TMPROOT install
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user