diff options
| author |   Michael Haubenwallner <haubi@gentoo.org> | 2012-09-26 06:50:53 +0000 |
|---|---|---|
| committer | Michael Haubenwallner <haubi@gentoo.org> | 2012-09-26 06:50:53 +0000 |
| commit | a8d325aadf52c0e00f0866c89af350e5dfea5067 (patch) | |
| tree | 8edd381d38571ca709bf1cd9ac4f88fcfe4ab85e /dev-db/tora/files | |
| parent | Specify LICENSE more precisely. Bump ebuild to EAPI 4. (diff) | |
| download | historical-a8d325aadf52c0e00f0866c89af350e5dfea5067.tar.gz historical-a8d325aadf52c0e00f0866c89af350e5dfea5067.tar.bz2 historical-a8d325aadf52c0e00f0866c89af350e5dfea5067.zip | |
Use dev-libs/ferrisloki instead of bundled one, bug#383109.
Package-Manager: portage-2.1.10.65/cvs/Linux x86_64
Diffstat (limited to 'dev-db/tora/files')
| -rw-r--r-- | dev-db/tora/files/tora-2.1.3-ext-loki.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/dev-db/tora/files/tora-2.1.3-ext-loki.patch b/dev-db/tora/files/tora-2.1.3-ext-loki.patch new file mode 100644 index 000000000000..dec482a31bc1 --- /dev/null +++ b/dev-db/tora/files/tora-2.1.3-ext-loki.patch @@ -0,0 +1,84 @@ +--- CMakeLists.txt.orig 2012-09-25 21:47:27.591130679 +0200 ++++ CMakeLists.txt 2012-09-25 21:51:02.953508806 +0200 +@@ -4,6 +4,7 @@ + # options available for user's input + OPTION(WANT_DEBUG "Set the debug build and possible additional outputs" OFF) + OPTION(WANT_INTERNAL_QSCINTILLA "Use internal/bundled QScintilla2 source" OFF) ++OPTION(WANT_INTERNAL_LOKI "Use internal/bundled Loki source" OFF) + OPTION(ENABLE_ORACLE "Enable/Disable Oracle support at all. Including detection" ON) + OPTION(ENABLE_PGSQL "Enable/Disable PostgreSQL support. Including detection" ON) + OPTION(ENABLE_DB2 "Enable/Disable DB2 support. Including detection" ON) +@@ -50,6 +51,7 @@ + INCLUDE(CheckCXXCompilerFlag) + INCLUDE(CheckTypeSize) + INCLUDE(TestBigEndian) ++INCLUDE(FindPkgConfig) + + #Set the custom CMake module directory where our include/lib finders are + SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") +@@ -197,6 +199,10 @@ + MESSAGE(FATAL_ERROR "No Qt4 found") + ENDIF(QT_FOUND) + ++IF (WANT_INTERNAL_LOKI) ++ELSE (WANT_INTERNAL_LOKI) ++ pkg_check_modules(LOKI REQUIRED ferrisloki) ++ENDIF (WANT_INTERNAL_LOKI) + + IF (WANT_INTERNAL_QSCINTILLA) + MESSAGE(STATUS "QSci: Building with internal copy of QScintilla.") +--- src/CMakeLists.txt.orig 2012-09-25 22:45:20.702694011 +0200 ++++ src/CMakeLists.txt 2012-09-25 22:47:39.742124547 +0200 +@@ -3,7 +3,10 @@ + + #Subdirectories + # ADD_SUBDIRECTORY(i18n) +-ADD_SUBDIRECTORY(loki) ++# Default: loki as 3rd party lib! ++IF (WANT_INTERNAL_LOKI) ++ ADD_SUBDIRECTORY(loki) ++ENDIF(WANT_INTERNAL_LOKI) + IF (WIN32) + ADD_SUBDIRECTORY(windows) + ENDIF (WIN32) +@@ -468,7 +471,9 @@ + QT4_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES}) + + +-LINK_DIRECTORIES(./loki) ++IF (WANT_INTERNAL_LOKI) ++ LINK_DIRECTORIES(./loki) ++ENDIF(WANT_INTERNAL_LOKI) + IF (WIN32) + LINK_DIRECTORIES(./windows) + ENDIF (WIN32) +@@ -477,7 +482,10 @@ + ENDIF (WANT_INTERNAL_QSCINTILLA) + + +-SET(TORA_LOKI_LIB "tora_loki_lib") ++IF (WANT_INTERNAL_LOKI) ++ SET(LOKI_LIBRARIES "tora_loki_lib") ++ SET(LOKI_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/loki/include) ++ENDIF(WANT_INTERNAL_LOKI) + IF (WANT_INTERNAL_QSCINTILLA) + SET (TORA_QSCINTILLA_LIB tora_qscintilla2_lib) + ENDIF (WANT_INTERNAL_QSCINTILLA) +@@ -493,7 +501,7 @@ + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${QT_INCLUDES} +- ${CMAKE_CURRENT_SOURCE_DIR}/loki/include ++ ${LOKI_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR}/otl + ) + +@@ -590,7 +598,7 @@ + ENDIF (USE_TROTL) + + # static +-TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_LOKI_LIB}) ++TARGET_LINK_LIBRARIES(${EXE_NAME} ${LOKI_LIBRARIES}) + IF (WANT_INTERNAL_QSCINTILLA) + TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_QSCINTILLA_LIB} ${QT_LIBRARIES}) + ENDIF (WANT_INTERNAL_QSCINTILLA) |