diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-24 17:44:59 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-24 17:44:59 +0000 |
commit | 0706fc6986773f4e4d391deff4ad5143c464ea4e (patch) | |
tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch | |
parent | aa3411e241a201d53a2689766fe419f2756819f3 (diff) |
Revert "gentoo resync : 24.03.2019"
This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.
Diffstat (limited to 'sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch')
-rw-r--r-- | sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch | 163 |
1 files changed, 0 insertions, 163 deletions
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch deleted file mode 100644 index 774293f34c4a..000000000000 --- a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch +++ /dev/null @@ -1,163 +0,0 @@ -diff --git a/CMakeModules/FindSCOTCH.cmake b/CMakeModules/FindSCOTCH.cmake -index 9f22b8d..0755470 100644 ---- a/CMakeModules/FindSCOTCH.cmake -+++ b/CMakeModules/FindSCOTCH.cmake -@@ -232,81 +232,83 @@ int main() { - ") - - message(STATUS "Performing test SCOTCH_TEST_RUNS") -- try_run( -- SCOTCH_TEST_LIB_EXITCODE -- SCOTCH_TEST_LIB_COMPILED -- ${CMAKE_CURRENT_BINARY_DIR} -- ${SCOTCH_TEST_LIB_CPP} -- CMAKE_FLAGS -- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" -- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" -- COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT -- RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT -- ) -- -- if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0) -- message(STATUS "Performing test SCOTCH_TEST_RUNS - Success") -- set(SCOTCH_TEST_RUNS TRUE) -- else() -- message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed") -- if (SCOTCH_DEBUG) -- # Output some variables -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}") -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}") -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") -- endif() -- endif() -- -- # If program does not run, try adding zlib library and test again -- if(NOT SCOTCH_TEST_RUNS) -- if (NOT ZLIB_FOUND) -- find_package(ZLIB) -- endif() -- -- if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES) -- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS}) -- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES}) -- -- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS") -- try_run( -- SCOTCH_ZLIB_TEST_LIB_EXITCODE -- SCOTCH_ZLIB_TEST_LIB_COMPILED -- ${CMAKE_CURRENT_BINARY_DIR} -- ${SCOTCH_TEST_LIB_CPP} -- CMAKE_FLAGS -- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" -- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" -- COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT -- RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT -- ) -- -- # Add zlib flags if required and set test run to 'true' -- if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0) -- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success") -- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) -- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES}) -- set(SCOTCH_TEST_RUNS TRUE) -- else() -- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed") -- if (SCOTCH_DEBUG) -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}") -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}") -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") -- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") -- endif() -- endif() -- -- endif() -- endif() -+ set(SCOTCH_TEST_RUNS FALSE) -+ message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed") -+ # try_run( -+ # SCOTCH_TEST_LIB_EXITCODE -+ # SCOTCH_TEST_LIB_COMPILED -+ # ${CMAKE_CURRENT_BINARY_DIR} -+ # ${SCOTCH_TEST_LIB_CPP} -+ # CMAKE_FLAGS -+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" -+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" -+ # COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT -+ # RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT -+ # ) -+ -+ # if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0) -+ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Success") -+ # set(SCOTCH_TEST_RUNS TRUE) -+ # else() -+ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed") -+ # if (SCOTCH_DEBUG) -+ # # Output some variables -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}") -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}") -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") -+ # endif() -+ # endif() -+ -+ # # If program does not run, try adding zlib library and test again -+ # if(NOT SCOTCH_TEST_RUNS) -+ # if (NOT ZLIB_FOUND) -+ # find_package(ZLIB) -+ # endif() -+ -+ # if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES) -+ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS}) -+ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES}) -+ -+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS") -+ # try_run( -+ # SCOTCH_ZLIB_TEST_LIB_EXITCODE -+ # SCOTCH_ZLIB_TEST_LIB_COMPILED -+ # ${CMAKE_CURRENT_BINARY_DIR} -+ # ${SCOTCH_TEST_LIB_CPP} -+ # CMAKE_FLAGS -+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" -+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" -+ # COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT -+ # RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT -+ # ) -+ -+ # # Add zlib flags if required and set test run to 'true' -+ # if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0) -+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success") -+ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) -+ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES}) -+ # set(SCOTCH_TEST_RUNS TRUE) -+ # else() -+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed") -+ # if (SCOTCH_DEBUG) -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}") -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}") -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}") -+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " -+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}") -+ # endif() -+ # endif() -+ -+ # endif() -+ # endif() - endif() - endif() - |