jlec 14/08/21 08:50:50 Modified: apbs-1.4.1-multilib.patch Added: apbs-1.4.1-manip.patch Log: sci-chemistry/apbs: Fix build failure with USE=tools, #520126 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.2 sci-chemistry/apbs/files/apbs-1.4.1-multilib.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.4.1-multilib.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.4.1-multilib.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.4.1-multilib.patch?r1=1.1&r2=1.2 Index: apbs-1.4.1-multilib.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/files/apbs-1.4.1-multilib.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apbs-1.4.1-multilib.patch 15 Aug 2014 08:50:34 -0000 1.1 +++ apbs-1.4.1-multilib.patch 21 Aug 2014 08:50:50 -0000 1.2 @@ -31,7 +31,7 @@ set(TABI_LIBRARY_BASENAME ${CMAKE_STATIC_LIBRARY_PREFIX}${TABI}${CMAKE_STATIC_LIBRARY_SUFFIX}) endif() - -+ ++ + file(GLOB MODS ${LIBRARY_OUTPUT_PATH}/*.mod) + install( @@ -70,18 +70,6 @@ SET(HAVE_MC_H YES) endif() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 44d20fa..5d5150b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -23,7 +23,6 @@ macro(add_items TYPE) - endmacro() - - -- - macro(add_sublibrary LIBRARY) - set(LIBRARY_NAME "apbs_${LIBRARY}") - set(LIBRARY_DEPENDENCIES ${APBS_LIBS} ${ARGN}) diff --git a/src/fem/CMakeLists.txt b/src/fem/CMakeLists.txt index 5a950c2..dc37f48 100644 --- a/src/fem/CMakeLists.txt 1.1 sci-chemistry/apbs/files/apbs-1.4.1-manip.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.4.1-manip.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/apbs/files/apbs-1.4.1-manip.patch?rev=1.1&content-type=text/plain Index: apbs-1.4.1-manip.patch =================================================================== apbs/CMakeLists.txt | 2 +- apbs/tools/CMakeLists.txt | 4 ---- apbs/tools/manip/CMakeLists.txt | 4 ++-- apbs/tools/mesh/CMakeLists.txt | 4 ++-- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/apbs/CMakeLists.txt b/apbs/CMakeLists.txt index 8917fc4..5152008 100644 --- a/apbs/CMakeLists.txt +++ b/apbs/CMakeLists.txt @@ -293,7 +293,7 @@ option(ENABLE_FETK "Enable the finite element solver" OFF) if(ENABLE_FETK) message(STATUS "Checking for fetk components") - set(FETK_ENALBED 1) + set(FETK_ENABLED 1) list(APPEND APBS_LIBS "-lstdc++") list(APPEND APBS_LIBS "-L${FETK_PATH}/lib") diff --git a/apbs/tools/CMakeLists.txt b/apbs/tools/CMakeLists.txt index 1982a3c..da3b8ee 100644 --- a/apbs/tools/CMakeLists.txt +++ b/apbs/tools/CMakeLists.txt @@ -2,7 +2,3 @@ set(EXECUTABLE_OUTPUT_PATH ${TOOLS_PATH}/bin) add_subdirectory(mesh) add_subdirectory(manip) - -if(ENABLE_PYTHON) - add_subdirectory(manip) -endif(ENABLE_PYTHON) diff --git a/apbs/tools/manip/CMakeLists.txt b/apbs/tools/manip/CMakeLists.txt index 937dac7..5768cc5 100644 --- a/apbs/tools/manip/CMakeLists.txt +++ b/apbs/tools/manip/CMakeLists.txt @@ -4,9 +4,9 @@ set(LIBS "") list(APPEND LIBS "apbs_generic") list(APPEND LIBS "apbs_mg") list(APPEND LIBS "apbs_pmgc") -if(FETK_ENALBED) +if(FETK_ENABLED) list(APPEND LIBS "apbs_fem") -endif(FETK_ENALBED) +endif(FETK_ENABLED) message(STATUS "libraries: ${LIBS}") diff --git a/apbs/tools/mesh/CMakeLists.txt b/apbs/tools/mesh/CMakeLists.txt index 1406377..6e6dfb9 100644 --- a/apbs/tools/mesh/CMakeLists.txt +++ b/apbs/tools/mesh/CMakeLists.txt @@ -4,9 +4,9 @@ set(LIBS "") list(APPEND LIBS "apbs_generic") list(APPEND LIBS "apbs_mg") list(APPEND LIBS "apbs_pmgc") -if(FETK_ENALBED) +if(FETK_ENABLED) list(APPEND LIBS "apbs_fem") -endif(FETK_ENALBED) +endif(FETK_ENABLED) message(STATUS "libraries: ${LIBS}")
