| 1 |
jlec 14/01/01 14:35:18 |
| 2 |
|
| 3 |
Added: exodusii-5.26-multilib.patch |
| 4 |
Log: |
| 5 |
sci-libs/exodusii: Version Bump |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-libs/exodusii/files/exodusii-5.26-multilib.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/exodusii/files/exodusii-5.26-multilib.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/exodusii/files/exodusii-5.26-multilib.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: exodusii-5.26-multilib.patch |
| 16 |
=================================================================== |
| 17 |
CMakeLists.txt | 6 +++--- |
| 18 |
cbind/CMakeLists.txt | 6 +++--- |
| 19 |
forbind/CMakeLists.txt | 12 ++++++------ |
| 20 |
3 files changed, 12 insertions(+), 12 deletions(-) |
| 21 |
|
| 22 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 23 |
index ca372f5..a071d99 100644 |
| 24 |
--- a/CMakeLists.txt |
| 25 |
+++ b/CMakeLists.txt |
| 26 |
@@ -27,7 +27,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h |
| 27 |
find_library( NETCDF_LIBRARY |
| 28 |
NAMES netcdf |
| 29 |
PATHS "$ENV{ACCESS}/lib" |
| 30 |
- "$ENV{NETCDF_DIR}/lib" |
| 31 |
+ "$ENV{NETCDF_DIR}/lib${LIB_SUFFIX}" |
| 32 |
"$ENV{NETCDF_DIR}/libsrc/.libs" |
| 33 |
) |
| 34 |
|
| 35 |
@@ -41,14 +41,14 @@ find_program (NETCDF_NCDUMP ncdump |
| 36 |
find_library( HDF5_LIBRARY hdf5 |
| 37 |
$ENV{ACCESS}/lib/shared |
| 38 |
$ENV{ACCESS}/lib |
| 39 |
- $ENV{NETCDF_DIR}/lib |
| 40 |
+ $ENV{NETCDF_DIR}/lib${LIB_SUFFIX} |
| 41 |
$ENV{NETCDF_DIR}/libsrc/.libs |
| 42 |
/usr/local/hdf5/lib |
| 43 |
) |
| 44 |
find_library( HDF5HL_LIBRARY hdf5_hl |
| 45 |
$ENV{ACCESS}/lib/shared |
| 46 |
$ENV{ACCESS}/lib |
| 47 |
- $ENV{NETCDF_DIR}/lib |
| 48 |
+ $ENV{NETCDF_DIR}/lib${LIB_SUFFIX} |
| 49 |
$ENV{NETCDF_DIR}/libsrc/.libs |
| 50 |
/usr/local/hdf5/lib |
| 51 |
) |
| 52 |
diff --git a/cbind/CMakeLists.txt b/cbind/CMakeLists.txt |
| 53 |
index 083891f..66fd17b 100644 |
| 54 |
--- a/cbind/CMakeLists.txt |
| 55 |
+++ b/cbind/CMakeLists.txt |
| 56 |
@@ -293,9 +293,9 @@ ENDIF(EXODUS_LIBRARY_PROPERTIES) |
| 57 |
|
| 58 |
IF(NOT EXODUS_INSTALL_NO_LIBRARIES) |
| 59 |
INSTALL(TARGETS exoIIv2c |
| 60 |
- RUNTIME DESTINATION lib COMPONENT Runtime |
| 61 |
- LIBRARY DESTINATION lib COMPONENT Runtime |
| 62 |
- ARCHIVE DESTINATION lib COMPONENT Development) |
| 63 |
+ RUNTIME DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime |
| 64 |
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime |
| 65 |
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT Development) |
| 66 |
INSTALL(FILES ${cbind_HEADERS} DESTINATION include COMPONENT Development) |
| 67 |
ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES) |
| 68 |
|
| 69 |
diff --git a/forbind/CMakeLists.txt b/forbind/CMakeLists.txt |
| 70 |
index 5ee026c..66ba1b3 100644 |
| 71 |
--- a/forbind/CMakeLists.txt |
| 72 |
+++ b/forbind/CMakeLists.txt |
| 73 |
@@ -14,7 +14,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h |
| 74 |
find_library( NETCDF_LIBRARY |
| 75 |
NAMES netcdf |
| 76 |
PATHS "$ENV{ACCESS}/lib" |
| 77 |
- "$ENV{NETCDF_DIR}/lib" |
| 78 |
+ "$ENV{NETCDF_DIR}/lib${LIB_SUFFIX}" |
| 79 |
"$ENV{NETCDF_DIR}/libsrc/.libs" |
| 80 |
) |
| 81 |
|
| 82 |
@@ -28,14 +28,14 @@ find_program (NETCDF_NCDUMP ncdump |
| 83 |
find_library( HDF5_LIBRARY hdf5 |
| 84 |
$ENV{ACCESS}/lib/shared |
| 85 |
$ENV{ACCESS}/lib |
| 86 |
- $ENV{NETCDF_DIR}/lib |
| 87 |
+ $ENV{NETCDF_DIR}/lib${LIB_SUFFIX} |
| 88 |
$ENV{NETCDF_DIR}/libsrc/.libs |
| 89 |
/usr/local/hdf5/lib |
| 90 |
) |
| 91 |
find_library( HDF5HL_LIBRARY hdf5_hl |
| 92 |
$ENV{ACCESS}/lib/shared |
| 93 |
$ENV{ACCESS}/lib |
| 94 |
- $ENV{NETCDF_DIR}/lib |
| 95 |
+ $ENV{NETCDF_DIR}/lib${LIB_SUFFIX} |
| 96 |
$ENV{NETCDF_DIR}/libsrc/.libs |
| 97 |
/usr/local/hdf5/lib |
| 98 |
) |
| 99 |
@@ -61,9 +61,9 @@ ENDIF(EXODUS_LIBRARY_PROPERTIES) |
| 100 |
|
| 101 |
IF(NOT EXODUS_INSTALL_NO_LIBRARIES) |
| 102 |
INSTALL(TARGETS exoIIv2for |
| 103 |
- RUNTIME DESTINATION lib COMPONENT Runtime |
| 104 |
- LIBRARY DESTINATION lib COMPONENT Runtime |
| 105 |
- ARCHIVE DESTINATION lib COMPONENT Development) |
| 106 |
+ RUNTIME DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime |
| 107 |
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime |
| 108 |
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT Development) |
| 109 |
INSTALL(FILES ${forbind_HEADERS} DESTINATION include COMPONENT Development) |
| 110 |
ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES) |
Archives