diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
commit | 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch) | |
tree | 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /sci-libs/nemesis/files | |
parent | 957235cf19a691360c720f7913672adda4258ed0 (diff) |
gentoo resync : 22.10.2018
Diffstat (limited to 'sci-libs/nemesis/files')
-rw-r--r-- | sci-libs/nemesis/files/nemesis-5.22b-multilib.patch | 57 | ||||
-rw-r--r-- | sci-libs/nemesis/files/nemesis-6.09-multilib.patch | 6 |
2 files changed, 3 insertions, 60 deletions
diff --git a/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch b/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch deleted file mode 100644 index b99add01ea56..000000000000 --- a/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch +++ /dev/null @@ -1,57 +0,0 @@ - nemesis/CMakeLists.txt | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/nemesis/CMakeLists.txt b/nemesis/CMakeLists.txt -index 64aff5d..bed5ede 100644 ---- a/nemesis/CMakeLists.txt -+++ b/nemesis/CMakeLists.txt -@@ -19,7 +19,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h - find_library( NETCDF_LIBRARY netcdf - $ENV{ACCESS}/lib/shared - $ENV{ACCESS}/lib -- $ENV{NETCDF_DIR}/lib -+ $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR} - $ENV{NETCDF_DIR}/libsrc/.libs - ) - -@@ -29,16 +29,17 @@ find_program (NETCDF_NCDUMP ncdump - $ENV{NETCDF_DIR}/ncdump - ) - --find_library( EXODUS_LIBRARY exodus -+find_library( EXODUS_LIBRARY exoIIv2c - $ENV{ACCESS}/lib/shared - $ENV{ACCESS}/lib -+ $ENV{EXODUS_DIR}/${CMAKE_INSTALL_LIBDIR} - ) - - # Hack for HDF5 - find_library( HDF5_LIBRARY hdf5 - $ENV{ACCESS}/lib/shared - $ENV{ACCESS}/lib -- $ENV{NETCDF_DIR}/lib -+ $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR} - $ENV{NETCDF_DIR}/libsrc/.libs - /usr/local/hdf5/lib - ) -@@ -46,7 +47,7 @@ find_library( HDF5_LIBRARY hdf5 - find_library( HDF5HL_LIBRARY hdf5_hl - $ENV{ACCESS}/lib/shared - $ENV{ACCESS}/lib -- $ENV{NETCDF_DIR}/lib -+ $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR} - $ENV{NETCDF_DIR}/libsrc/.libs - /usr/local/hdf5/lib - ) -@@ -79,8 +80,8 @@ ADD_EXECUTABLE(ne_test ne_ctest_wrap.c) - TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY}) - - INSTALL(TARGETS nemesis -- RUNTIME DESTINATION lib COMPONENT Runtime -- LIBRARY DESTINATION lib COMPONENT Runtime -- ARCHIVE DESTINATION lib COMPONENT Development) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development) - INSTALL(FILES ${HEADERS} DESTINATION include COMPONENT Development) - diff --git a/sci-libs/nemesis/files/nemesis-6.09-multilib.patch b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch index d0f05f23a2d2..09b5c9a60377 100644 --- a/sci-libs/nemesis/files/nemesis-6.09-multilib.patch +++ b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch @@ -1,10 +1,10 @@ nemesis/CMakeLists.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -diff --git a/nemesis/CMakeLists.txt b/nemesis/CMakeLists.txt +diff --git a/CMakeLists.txt b/CMakeLists.txt index 64aff5d..bed5ede 100644 ---- a/nemesis/CMakeLists.txt -+++ b/nemesis/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -19,7 +19,7 @@ find_library( NETCDF_LIBRARY netcdf $ENV{ACCESS}/lib/shared |