From edcff8f9ace3b07a794287cd50bdee217ef2cbdd Mon Sep 17 00:00:00 2001 From: kueller Date: Mon, 9 May 2011 09:38:24 +0000 Subject: [PATCH] Back to old version. KDE kann noch nicht mit der neuesten Version kompiliert werden git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6096 504e572c-2e33-0410-9681-be2bf7408885 --- SysBuild/tools/clucene-core | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/SysBuild/tools/clucene-core b/SysBuild/tools/clucene-core index ae8856c..2024c62 100644 --- a/SysBuild/tools/clucene-core +++ b/SysBuild/tools/clucene-core @@ -3,7 +3,7 @@ #dieses Framework wird im CVS Repository #:pserver:cvs.compuextreme.de:/Data/cvs zur Verfügung gestellt # -#Lage dieser Datei im Archiv: $HeadURL: $ +#Lage dieser Datei im Archiv: $HeadURL$ # #(c) 2003 Harald Kueller, Germany #This program is free software; you can redistribute it and/or @@ -78,40 +78,27 @@ premk() { } mk32() { - mkdir -v build && - cd build && + CC="gcc $BUILDOPTIONS32" \ + CXX="g++ $BUILDOPTIONS32" \ USE_ARCH=32 \ - CC="gcc $BUILDOPTIONS32 -L/opt/kde/lib" \ - CXX="g++ $BUILDOPTIONS32 -L/opt/kde/lib" \ - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS="${BUILDOPTIONS32}" \ - -DCMAKE_CXX_FLAGS="${BUILDOPTIONS32}" \ - -DLIB_SUFFIX= \ - .. && + ./configure --target=$TARGET32 \ + --prefix=/usr make -j $NUMCPU - make DESTDIR=$TMPROOT install - cd .. - rm -r build + make -j $NUMCPU DESTDIR=$TMPROOT install } mk() { - if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="-DLIB_SUFFIX=64" - fi - mkdir -v build - cd build CC="gcc $BUILDOPTIONS -fPIC" \ CXX="g++ $BUILDOPTIONS -fPIC" \ USE_ARCH=$UARCH \ - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS="${BUILDOPTIONS}" \ - -DCMAKE_CXX_FLAGS="${BUILDOPTIONS}" \ - $ADDOPTIONS \ - .. && + ./configure --target=$TARGET \ + --libdir=\${prefix}/${LIBDIR} \ + --prefix=/usr make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install + if [ "$MK64BIT" == "true" ]; then + GenDynLib $TMPROOT/usr/lib64/libclucene.a 0.0.0 + fi } postmk() {