[gentoo-commits] gentoo-x86 commit in sci-libs/exodusii/files: exodusii-5.22b-multilib.patch

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] gentoo-x86 commit in sci-libs/exodusii/files: exodusii-5.22b-multilib.patch
@ 2012-12-13 12:38 Justin Lecher (jlec)
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2012-12-13 12:38 UTC (permalink / raw
  To: gentoo-commits

jlec        12/12/13 12:38:56

  Added:                exodusii-5.22b-multilib.patch
  Log:
  sci-libs/exodusii: Imported from sci overlay, #344063; needed for #433481
  
  (Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

Revision  Changes    Path
1.1                  sci-libs/exodusii/files/exodusii-5.22b-multilib.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/exodusii/files/exodusii-5.22b-multilib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/exodusii/files/exodusii-5.22b-multilib.patch?rev=1.1&content-type=text/plain

Index: exodusii-5.22b-multilib.patch
===================================================================
 exodus/CMakeLists.txt         |  8 ++++----
 exodus/cbind/CMakeLists.txt   |  6 +++---
 exodus/forbind/CMakeLists.txt | 13 +++++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/exodus/CMakeLists.txt b/exodus/CMakeLists.txt
index 935da5a..db8aed4 100644
--- a/exodus/CMakeLists.txt
+++ b/exodus/CMakeLists.txt
@@ -7,7 +7,7 @@ SET(EXODUSII_VERSION_PATCH "0")
 SET(EXODUSII_VERSION "${EXODUSII_VERSION_MAJOR}.${EXODUSII_VERSION_MINOR}")
 SET(EXODUSII_VERSION_FULL "${EXODUSII_VERSION}.${EXODUSII_VERSION_PATCH}")
 
-SET(EXODUSII_BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS}")
+SET(EXODUSII_BUILD_SHARED_${LIB_INSTALL_DIR}S "${BUILD_SHARED_LIBS}")
 
 SUBDIRS(cbind forbind)
 
@@ -21,7 +21,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
 find_library( NETCDF_LIBRARY
    NAMES netcdf
    PATHS "$ENV{ACCESS}/lib"
-         "$ENV{NETCDF_DIR}/lib"
+         "$ENV{NETCDF_DIR}/${LIB_INSTALL_DIR}"
 	 "$ENV{NETCDF_DIR}/libsrc/.libs"
 )
 
@@ -35,14 +35,14 @@ find_program (NETCDF_NCDUMP ncdump
 find_library( HDF5_LIBRARY hdf5
   $ENV{ACCESS}/lib/shared
   $ENV{ACCESS}/lib
-  $ENV{NETCDF_DIR}/lib
+  $ENV{NETCDF_DIR}/${LIB_INSTALL_DIR}
   $ENV{NETCDF_DIR}/libsrc/.libs
   /usr/local/hdf5/lib
   )
 find_library( HDF5HL_LIBRARY hdf5_hl
   $ENV{ACCESS}/lib/shared
   $ENV{ACCESS}/lib
-  $ENV{NETCDF_DIR}/lib
+  $ENV{NETCDF_DIR}/${LIB_INSTALL_DIR}
   $ENV{NETCDF_DIR}/libsrc/.libs
   /usr/local/hdf5/lib
   )
diff --git a/exodus/cbind/CMakeLists.txt b/exodus/cbind/CMakeLists.txt
index 9aa54e9..f020d65 100644
--- a/exodus/cbind/CMakeLists.txt
+++ b/exodus/cbind/CMakeLists.txt
@@ -259,9 +259,9 @@ ENDIF(EXODUS_LIBRARY_PROPERTIES)
 
 IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS exoIIv2c
-    RUNTIME DESTINATION lib COMPONENT Runtime
-    LIBRARY DESTINATION lib COMPONENT Runtime
-    ARCHIVE DESTINATION lib COMPONENT Development)
+    RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT Runtime
+    LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT Runtime
+    ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT Development)
   INSTALL(FILES ${cbind_HEADERS} DESTINATION include COMPONENT Development)
 ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
 
diff --git a/exodus/forbind/CMakeLists.txt b/exodus/forbind/CMakeLists.txt
index 4a5e7c7..484eedf 100644
--- a/exodus/forbind/CMakeLists.txt
+++ b/exodus/forbind/CMakeLists.txt
@@ -14,7 +14,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
 find_library( NETCDF_LIBRARY
    NAMES netcdf
    PATHS "$ENV{ACCESS}/lib"
-         "$ENV{NETCDF_DIR}/lib"
+         "$ENV{NETCDF_DIR}/${LIB_INSTALL_DIR}"
 	 "$ENV{NETCDF_DIR}/libsrc/.libs"
 )
 
@@ -28,20 +28,21 @@ find_program (NETCDF_NCDUMP ncdump
 find_library( HDF5_LIBRARY hdf5
   $ENV{ACCESS}/lib/shared
   $ENV{ACCESS}/lib
-  $ENV{NETCDF_DIR}/lib
+  $ENV{NETCDF_DIR}/${LIB_INSTALL_DIR}
   $ENV{NETCDF_DIR}/libsrc/.libs
   /usr/local/hdf5/lib
   )
 find_library( HDF5HL_LIBRARY hdf5_hl
   $ENV{ACCESS}/lib/shared
   $ENV{ACCESS}/lib
-  $ENV{NETCDF_DIR}/lib
+  $ENV{NETCDF_DIR}/${LIB_INSTALL_DIR}
   $ENV{NETCDF_DIR}/libsrc/.libs
   /usr/local/hdf5/lib
   )
 
 INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}/include"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../cbind/include"
   "${CMAKE_CURRENT_BINARY_DIR}/include"
   "${NETCDF_INCLUDE_DIR}"
 )
@@ -60,9 +61,9 @@ ENDIF(EXODUS_LIBRARY_PROPERTIES)
 
 IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS exoIIv2for
-    RUNTIME DESTINATION lib COMPONENT Runtime
-    LIBRARY DESTINATION lib COMPONENT Runtime
-    ARCHIVE DESTINATION lib COMPONENT Development)
+    RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT Runtime
+    LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT Runtime
+    ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT Development)
   INSTALL(FILES ${forbind_HEADERS} DESTINATION include COMPONENT Development)
 ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
 





^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-libs/exodusii/files: exodusii-5.22b-multilib.patch
@ 2012-12-13 14:06 Justin Lecher (jlec)
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2012-12-13 14:06 UTC (permalink / raw
  To: gentoo-commits

jlec        12/12/13 14:06:55

  Modified:             exodusii-5.22b-multilib.patch
  Log:
  sci-libs/exodusii: Do things the gentoo way; fix tests
  
  (Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

Revision  Changes    Path
1.2                  sci-libs/exodusii/files/exodusii-5.22b-multilib.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/exodusii/files/exodusii-5.22b-multilib.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/exodusii/files/exodusii-5.22b-multilib.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/exodusii/files/exodusii-5.22b-multilib.patch?r1=1.1&r2=1.2

Index: exodusii-5.22b-multilib.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/exodusii/files/exodusii-5.22b-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- exodusii-5.22b-multilib.patch	13 Dec 2012 12:38:56 -0000	1.1
+++ exodusii-5.22b-multilib.patch	13 Dec 2012 14:06:55 -0000	1.2
@@ -1,27 +1,18 @@
- exodus/CMakeLists.txt         |  8 ++++----
+ exodus/CMakeLists.txt         |  6 +++---
  exodus/cbind/CMakeLists.txt   |  6 +++---
  exodus/forbind/CMakeLists.txt | 13 +++++++------
- 3 files changed, 14 insertions(+), 13 deletions(-)
+ 3 files changed, 13 insertions(+), 12 deletions(-)
 
 diff --git a/exodus/CMakeLists.txt b/exodus/CMakeLists.txt
-index 935da5a..db8aed4 100644
+index 935da5a..33c68ca 100644
 --- a/exodus/CMakeLists.txt
 +++ b/exodus/CMakeLists.txt
-@@ -7,7 +7,7 @@ SET(EXODUSII_VERSION_PATCH "0")
- SET(EXODUSII_VERSION "${EXODUSII_VERSION_MAJOR}.${EXODUSII_VERSION_MINOR}")
- SET(EXODUSII_VERSION_FULL "${EXODUSII_VERSION}.${EXODUSII_VERSION_PATCH}")
- 
--SET(EXODUSII_BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS}")
-+SET(EXODUSII_BUILD_SHARED_${LIB_INSTALL_DIR}S "${BUILD_SHARED_LIBS}")
- 
- SUBDIRS(cbind forbind)
- 
 @@ -21,7 +21,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
  find_library( NETCDF_LIBRARY
     NAMES netcdf
     PATHS "$ENV{ACCESS}/lib"
 -         "$ENV{NETCDF_DIR}/lib"
-+         "$ENV{NETCDF_DIR}/${LIB_INSTALL_DIR}"
++         "$ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}"
  	 "$ENV{NETCDF_DIR}/libsrc/.libs"
  )
  
@@ -30,7 +21,7 @@
    $ENV{ACCESS}/lib/shared
    $ENV{ACCESS}/lib
 -  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/${LIB_INSTALL_DIR}
++  $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
    $ENV{NETCDF_DIR}/libsrc/.libs
    /usr/local/hdf5/lib
    )
@@ -38,12 +29,12 @@
    $ENV{ACCESS}/lib/shared
    $ENV{ACCESS}/lib
 -  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/${LIB_INSTALL_DIR}
++  $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
    $ENV{NETCDF_DIR}/libsrc/.libs
    /usr/local/hdf5/lib
    )
 diff --git a/exodus/cbind/CMakeLists.txt b/exodus/cbind/CMakeLists.txt
-index 9aa54e9..f020d65 100644
+index 9aa54e9..a19a969 100644
 --- a/exodus/cbind/CMakeLists.txt
 +++ b/exodus/cbind/CMakeLists.txt
 @@ -259,9 +259,9 @@ ENDIF(EXODUS_LIBRARY_PROPERTIES)
@@ -53,14 +44,14 @@
 -    RUNTIME DESTINATION lib COMPONENT Runtime
 -    LIBRARY DESTINATION lib COMPONENT Runtime
 -    ARCHIVE DESTINATION lib COMPONENT Development)
-+    RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT Runtime
-+    LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT Runtime
-+    ARCHIVE DESTINATION ${LIB_INSTALL_DIR} 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 ${cbind_HEADERS} DESTINATION include COMPONENT Development)
  ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
  
 diff --git a/exodus/forbind/CMakeLists.txt b/exodus/forbind/CMakeLists.txt
-index 4a5e7c7..484eedf 100644
+index 4a5e7c7..dad37ae 100644
 --- a/exodus/forbind/CMakeLists.txt
 +++ b/exodus/forbind/CMakeLists.txt
 @@ -14,7 +14,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
@@ -68,7 +59,7 @@
     NAMES netcdf
     PATHS "$ENV{ACCESS}/lib"
 -         "$ENV{NETCDF_DIR}/lib"
-+         "$ENV{NETCDF_DIR}/${LIB_INSTALL_DIR}"
++         "$ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}"
  	 "$ENV{NETCDF_DIR}/libsrc/.libs"
  )
  
@@ -77,7 +68,7 @@
    $ENV{ACCESS}/lib/shared
    $ENV{ACCESS}/lib
 -  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/${LIB_INSTALL_DIR}
++  $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
    $ENV{NETCDF_DIR}/libsrc/.libs
    /usr/local/hdf5/lib
    )
@@ -85,7 +76,7 @@
    $ENV{ACCESS}/lib/shared
    $ENV{ACCESS}/lib
 -  $ENV{NETCDF_DIR}/lib
-+  $ENV{NETCDF_DIR}/${LIB_INSTALL_DIR}
++  $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
    $ENV{NETCDF_DIR}/libsrc/.libs
    /usr/local/hdf5/lib
    )
@@ -103,9 +94,9 @@
 -    RUNTIME DESTINATION lib COMPONENT Runtime
 -    LIBRARY DESTINATION lib COMPONENT Runtime
 -    ARCHIVE DESTINATION lib COMPONENT Development)
-+    RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT Runtime
-+    LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT Runtime
-+    ARCHIVE DESTINATION ${LIB_INSTALL_DIR} 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 ${forbind_HEADERS} DESTINATION include COMPONENT Development)
  ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
  





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-12-13 14:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-13 12:38 [gentoo-commits] gentoo-x86 commit in sci-libs/exodusii/files: exodusii-5.22b-multilib.patch Justin Lecher (jlec)
  -- strict thread matches above, loose matches on Subject: below --
2012-12-13 14:06 Justin Lecher (jlec)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox