Juhani Numminen pushed to branch master at Debian Med / libroadrunner
Commits: 4ecbf394 by Juhani Numminen at 2021-02-17T10:44:18+02:00 Let CMakeLists.txt find modules under llvm's installation prefix the variable DEB_CMAKE_NORMAL_ARGS has a special meaning for cdbs but this package does not use cdbs; removed it from debian/rules - - - - - 959f44a4 by Juhani Numminen at 2021-02-17T10:45:07+02:00 Use hardening - - - - - 3 changed files: - − debian/patches/debug_cmake.patch - debian/patches/series - debian/rules Changes: ===================================== debian/patches/debug_cmake.patch deleted ===================================== @@ -1,42 +0,0 @@ -Author: Andreas Tille <[email protected]> -Last-Update: Tue, 31 Jan 2017 09:50:22 +0100 -Description: Fixes: - CMake Error at cmake/FindLLVM.cmake:159 (STRING): - string sub-command REGEX, mode REPLACE needs at least 6 arguments total to - command. - Call Stack (most recent call first): - CMakeLists.txt:78 (find_package) -FIXME: Output warning about empty ${LLVM_LIBRARIES} variable which probably is - not what we want ... - ---- a/cmake/FindLLVM.cmake -+++ b/cmake/FindLLVM.cmake -@@ -146,6 +146,13 @@ if (LLVM_CONFIG_EXECUTABLE) - - # link libraries, currently only need core, jit and native. - # TODO: in future, replace this with something like LLVM_CORE_LIBS, LLVM_JIT_LIBS... -+ if( DEFINED ${LLVM_CONFIG_EXECUTABLE} ) -+ message( "LLVM_CONFIG_EXECUTABLE defined. Value is ${LLVM_CONFIG_EXECUTABLE}") -+ else() -+ message("FIXME: Variable LLVM_CONFIG_EXECUTABLE is empty!") -+ endif() -+ -+ STRING(REGEX REPLACE "[\n\t\r ]+" ";" LLVM_LIBRARIES "${LLVM_LIBRARIES}") - execute_process( - COMMAND ${LLVM_CONFIG_EXECUTABLE} --libfiles core jit native - OUTPUT_VARIABLE LLVM_LIBRARIES -@@ -156,7 +163,13 @@ if (LLVM_CONFIG_EXECUTABLE) - STRING(REGEX REPLACE "lib([^/\\]*)\\.a" "\\1.lib" LLVM_LIBRARIES ${LLVM_LIBRARIES}) - endif() - # we get a space sep list from llvm-config, make it a cmake ; separated list. -- STRING(REGEX REPLACE "[\n\t\r ]+" ";" LLVM_LIBRARIES ${LLVM_LIBRARIES}) -+ if( DEFINED ${LLVM_LIBRARIES} ) -+ message( "LLVM_LIBRARIES defined. Value is ${LLVM_LIBRARIES}") -+ else() -+ message("FIXME: Variable LLVM_LIBRARIES is empty!") -+ endif() -+ -+ STRING(REGEX REPLACE "[\n\t\r ]+" ";" LLVM_LIBRARIES "${LLVM_LIBRARIES}") - message(STATUS "LLVM_LIBRARIES: ${LLVM_LIBRARIES}") - - # starting with LLVM 3.4 (at least on Ubuntu) it requres functions in ===================================== debian/patches/series ===================================== @@ -1,3 +1,2 @@ do_not_build_depend_git.patch -debug_cmake.patch gcc-10.patch ===================================== debian/rules ===================================== @@ -1,15 +1,15 @@ #!/usr/bin/make -f -# DH_VERBOSE := 1 -export LC_ALL=C.UTF-8 - -DEB_CMAKE_NORMAL_ARGS += -DLLVM_CONFIG_EXECUTABLE=/usr/bin/llvm-config \ - -DBUILD_PYTHON=TRUE - -## -DTHIRD_PARTY_INSTALL_FOLDER=/home/user/devel/install/roadrunner-deps +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ override_dh_auto_configure: - dh_auto_configure -- $(DEB_CMAKE_NORMAL_ARGS) + dh_auto_configure -- \ + -DLLVM_INSTALL_PREFIX="$(shell llvm-config --prefix)" \ + -DBUILD_PYTHON=ON \ + -DBUILD_TESTS=ON \ + -DBUILD_TEST_TOOLS=ON + +## -DTHIRD_PARTY_INSTALL_FOLDER=/home/user/devel/install/roadrunner-deps View it on GitLab: https://salsa.debian.org/med-team/libroadrunner/-/compare/fb96e7ecc5e02fb5fa5da3b476d53abf40a36e15...959f44a43d4f0d563fe21bc6167cf38b84be3d53 -- View it on GitLab: https://salsa.debian.org/med-team/libroadrunner/-/compare/fb96e7ecc5e02fb5fa5da3b476d53abf40a36e15...959f44a43d4f0d563fe21bc6167cf38b84be3d53 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
