diff options
| -rw-r--r-- | dev-libs/soprano/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/soprano/files/soprano-make-optional-targets.patch | 191 | ||||
| -rw-r--r-- | dev-libs/soprano/soprano-9999.ebuild | 2 |
3 files changed, 1 insertions, 195 deletions
diff --git a/dev-libs/soprano/Manifest b/dev-libs/soprano/Manifest index 6c81067c33a..79b4eb2279f 100644 --- a/dev-libs/soprano/Manifest +++ b/dev-libs/soprano/Manifest @@ -1,4 +1,3 @@ -AUX soprano-make-optional-targets.patch 7769 RMD160 cadf6db4d8c38c0f4879838ea049695dca48af4e SHA1 4489d50c89788d41746921cf890da6bf46bf7ce8 SHA256 32e55e17e6519947f877d63174e41ee033af05470d4a252031d1165c579e0872 -EBUILD soprano-9999.ebuild 2111 RMD160 62bc731e0871645718780c93ca7802eb4c7ba174 SHA1 2cd693b523e32e47217a2da5926af73c3bef40d3 SHA256 10a90f7e3730728b7787299dd4ed2527bc8fde96fa86dbf66c9b4ad0dec609cb +EBUILD soprano-9999.ebuild 2050 RMD160 83cba4d97482d27b7ba6238186d0ec09251f7ebc SHA1 03e54616702cd63c4132c4d37b7ffec0d630c3fc SHA256 204d3a1859c373cdae76e4769f2adf1e981efc2a8f7d5fb20b0d10572d6cc3cd MISC ChangeLog 1308 RMD160 cfeeb7d15826b448bf84c8ea22f1d05df07abb9e SHA1 a53ba3f2989094293a910921f2f6ee39ef97bb80 SHA256 bbf1efb8e2b98f3fd49f463eec17278d92eb159f7e6f0dc680c5ba4c6a2f233d MISC metadata.xml 440 RMD160 290571f5152906ed32eacad5ce6138f510b2a361 SHA1 6ed3b3208cefbbc0b1463be20e7ec173834b8109 SHA256 d805c4de395442d3e76d1937d4033d2cef5723e175630d8497e681e3901fde4c diff --git a/dev-libs/soprano/files/soprano-make-optional-targets.patch b/dev-libs/soprano/files/soprano-make-optional-targets.patch deleted file mode 100644 index 3a3b40edfd0..00000000000 --- a/dev-libs/soprano/files/soprano-make-optional-targets.patch +++ /dev/null @@ -1,191 +0,0 @@ -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (revision 918069) -+++ CMakeLists.txt (working copy) -@@ -1,4 +1,4 @@ --project(soprano) -+project(soprano) - - cmake_minimum_required(VERSION 2.6.2) - -@@ -9,10 +9,8 @@ - set(CMAKE_SOPRANO_VERSION_RELEASE 60) - set(CMAKE_SOPRANO_VERSION_STRING "${CMAKE_SOPRANO_VERSION_MAJOR}.${CMAKE_SOPRANO_VERSION_MINOR}.${CMAKE_SOPRANO_VERSION_RELEASE}") - --enable_testing() -+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) - --set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) -- - if(WIN32) - set(CMAKE_DEBUG_POSTFIX "d") - endif(WIN32) -@@ -20,37 +18,45 @@ - ################## find packages ################################ - - set(QT_MIN_VERSION "4.4.0") --find_package(Qt4 REQUIRED) -+find_package(Qt4 REQUIRED) - # properly set up compile flags (QT_DEBUG/QT_NO_DEBUG, ...) - include(${QT_USE_FILE}) - --find_package(Redland) -+option(ENABLE_Redland "Raptor RDF parser/serializer and Redland storage backend" OFF) -+if(ENABLE_Redland) -+ find_package(Redland) -+endif(ENABLE_Redland) - --find_package(CLucene) --if(CLucene_FOUND) -- if(CLUCENE_VERSION AND CLUCENE_VERSION STRGREATER "0.9.19" OR CLUCENE_VERSION STREQUAL "0.9.19") -- set(CL_VERSION_19_OR_GREATER TRUE) -- endif(CLUCENE_VERSION AND CLUCENE_VERSION STRGREATER "0.9.19" OR CLUCENE_VERSION STREQUAL "0.9.19") -- set(SOPRANO_BUILD_INDEX_LIB 1 CACHE INTERNAL "Soprano Index is built" FORCE) --endif(CLucene_FOUND) -+option(ENABLE_CLucene "CLucene-based full-text search index library" ON) -+if(ENABLE_CLucene) -+ find_package(CLucene) -+ if(CLucene_FOUND) -+ if(CLUCENE_VERSION AND CLUCENE_VERSION STRGREATER "0.9.19" OR CLUCENE_VERSION STREQUAL "0.9.19") -+ set(CL_VERSION_19_OR_GREATER TRUE) -+ endif(CLUCENE_VERSION AND CLUCENE_VERSION STRGREATER "0.9.19" OR CLUCENE_VERSION STREQUAL "0.9.19") -+ set(SOPRANO_BUILD_INDEX_LIB 1 CACHE INTERNAL "Soprano Index is built" FORCE) -+ endif(CLucene_FOUND) -+endif(ENABLE_CLucene) - --find_package(JNI) --if(JAVA_INCLUDE_PATH AND JAVA_JVM_LIBRARY) -- file(READ ${JAVA_INCLUDE_PATH}/jni.h jni_header_data) -- string(REGEX MATCH "JNI_VERSION_1_4" JNI_1_4_FOUND "${jni_header_data}") -- if(JNI_1_4_FOUND) -- message(STATUS "Found Java JNI >= 1.4: ${JAVA_INCLUDE_PATH}, ${JAVA_JVM_LIBRARY}") -- else(JNI_1_4_FOUND) -- message( "Need JNI version 1.4 or higher for the Sesame2 backend.") -- endif(JNI_1_4_FOUND) --else(JAVA_INCLUDE_PATH AND JAVA_JVM_LIBRARY) -- message(STATUS "Could not find Java JNI") -- if("$ENV{JAVA_HOME}" STREQUAL "") -- message("Make sure JAVA_HOME is set") -- endif("$ENV{JAVA_HOME}" STREQUAL "") --endif(JAVA_INCLUDE_PATH AND JAVA_JVM_LIBRARY) -+option(ENABLE_Sesame2 "Sesame2 storage backend (java-based)" ON) -+if(ENABLE_Sesame2) -+ find_package(JNI) -+ if(JAVA_INCLUDE_PATH AND JAVA_JVM_LIBRARY) -+ file(READ ${JAVA_INCLUDE_PATH}/jni.h jni_header_data) -+ string(REGEX MATCH "JNI_VERSION_1_4" JNI_1_4_FOUND "${jni_header_data}") -+ if(JNI_1_4_FOUND) -+ message(STATUS "Found Java JNI >= 1.4: ${JAVA_INCLUDE_PATH}, ${JAVA_JVM_LIBRARY}") -+ else(JNI_1_4_FOUND) -+ message( "Need JNI version 1.4 or higher for the Sesame2 backend.") -+ endif(JNI_1_4_FOUND) -+ else(JAVA_INCLUDE_PATH AND JAVA_JVM_LIBRARY) -+ message(STATUS "Could not find Java JNI") -+ if("$ENV{JAVA_HOME}" STREQUAL "") -+ message("Make sure JAVA_HOME is set") -+ endif("$ENV{JAVA_HOME}" STREQUAL "") -+ endif(JAVA_INCLUDE_PATH AND JAVA_JVM_LIBRARY) -+endif(ENABLE_Sesame2) - -- - ################## setup install directories ################################ - set (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) - set (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name") -@@ -63,40 +69,47 @@ - # By default cmake builds the targets with full RPATH to everything in the build directory, - # but then removes the RPATH when installing. - # These two options below make it set the RPATH of the installed targets to all --# RPATH directories outside the current CMAKE_BINARY_DIR and also the library -+# RPATH directories outside the current CMAKE_BINARY_DIR and also the library - # install directory. Alex - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) --set(CMAKE_INSTALL_RPATH ${LIB_DESTINATION} ) -+set(CMAKE_INSTALL_RPATH ${LIB_DESTINATION}) - - if(APPLE) -- set(CMAKE_INSTALL_NAME_DIR ${LIB_DESTINATION}) -+ set(CMAKE_INSTALL_NAME_DIR ${LIB_DESTINATION}) - endif(APPLE) - - - ################## some compiler settings ################################ - if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32 ) -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common") - endif(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32 ) - if(MSVC) -- add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -Zc:wchar_t-) -+ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -Zc:wchar_t-) - endif(MSVC) - if(MINGW) -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -Wpointer-arith -Wformat-security -fno-check-new -fno-common") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -Wpointer-arith -Wformat-security -fno-check-new -fno-common") - endif(MINGW) - - - ################## add subdirectories ################################ - if(CLucene_FOUND) -- add_subdirectory(index) -+ add_subdirectory(index) - endif(CLucene_FOUND) --add_subdirectory(soprano) -+ -+add_subdirectory(soprano) - add_subdirectory(backends) - add_subdirectory(parsers) - add_subdirectory(serializers) - #add_subdirectory(queryparsers) - add_subdirectory(server) - add_subdirectory(tools) --add_subdirectory(test) -+ -+option(ENABLE_tests "Parser/storage backend tests)" ON) -+if(ENABLE_tests) -+ enable_testing() -+ add_subdirectory(test) -+endif(ENABLE_tests) -+ - add_subdirectory(rules) - add_subdirectory(includes) - -@@ -109,24 +122,26 @@ - - - ################## apidox ################################ --find_package(Doxygen) -+option(ENABLE_docs "API documentation" ON) -+if(ENABLE_docs) -+ find_package(Doxygen) - --if(DOXYGEN_EXECUTABLE) -- configure_file(${soprano_SOURCE_DIR}/Doxyfile.cmake ${soprano_BINARY_DIR}/Doxyfile) -+ if(DOXYGEN_EXECUTABLE) -+ configure_file(${soprano_SOURCE_DIR}/Doxyfile.cmake ${soprano_BINARY_DIR}/Doxyfile) - -- if(EXISTS ${QT_DOC_DIR}/html) -- set(QTDOCS "${QT_DOC_DIR}/html") -- else(EXISTS ${QT_DOC_DIR}/html) -- set(QTDOCS "http://doc.trolltech.com/4.3/") -- endif(EXISTS ${QT_DOC_DIR}/html) -+ if(EXISTS ${QT_DOC_DIR}/html) -+ set(QTDOCS "${QT_DOC_DIR}/html") -+ else(EXISTS ${QT_DOC_DIR}/html) -+ set(QTDOCS "http://doc.trolltech.com/4.3/") -+ endif(EXISTS ${QT_DOC_DIR}/html) - -- add_custom_target( -- apidox -- COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile -- COMMAND docs/html/installdox -l qt4.tag@${QTDOCS} docs/html/*.html) --endif(DOXYGEN_EXECUTABLE) -+ add_custom_target( -+ apidox -+ COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile -+ COMMAND docs/html/installdox -l qt4.tag@${QTDOCS} docs/html/*.html) -+ endif(DOXYGEN_EXECUTABLE) -+endif(ENABLE_docs) - -- - ################## status messages ################################ - message("---------------------------------------------------------------------------------------") - message("-- Soprano Components that will be built:") diff --git a/dev-libs/soprano/soprano-9999.ebuild b/dev-libs/soprano/soprano-9999.ebuild index b5f2632cb28..8744d212eb5 100644 --- a/dev-libs/soprano/soprano-9999.ebuild +++ b/dev-libs/soprano/soprano-9999.ebuild @@ -32,8 +32,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-make-optional-targets.patch" ) - CMAKE_IN_SOURCE_BUILD="1" pkg_setup() { |