diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-libs/exodusii/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-libs/exodusii/files')
-rw-r--r-- | sci-libs/exodusii/files/exodusii-5.22b-multilib.patch | 102 | ||||
-rw-r--r-- | sci-libs/exodusii/files/exodusii-5.26-multilib.patch | 95 |
2 files changed, 197 insertions, 0 deletions
diff --git a/sci-libs/exodusii/files/exodusii-5.22b-multilib.patch b/sci-libs/exodusii/files/exodusii-5.22b-multilib.patch new file mode 100644 index 000000000000..3cde66622c1d --- /dev/null +++ b/sci-libs/exodusii/files/exodusii-5.22b-multilib.patch @@ -0,0 +1,102 @@ + exodus/CMakeLists.txt | 6 +++--- + exodus/cbind/CMakeLists.txt | 6 +++--- + exodus/forbind/CMakeLists.txt | 13 +++++++------ + 3 files changed, 13 insertions(+), 12 deletions(-) + +diff --git a/exodus/CMakeLists.txt b/exodus/CMakeLists.txt +index 935da5a..33c68ca 100644 +--- a/exodus/CMakeLists.txt ++++ b/exodus/CMakeLists.txt +@@ -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}/${CMAKE_INSTALL_LIBDIR}" + "$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}/${CMAKE_INSTALL_LIBDIR} + $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}/${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..a19a969 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 ${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..dad37ae 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}/${CMAKE_INSTALL_LIBDIR}" + "$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}/${CMAKE_INSTALL_LIBDIR} + $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}/${CMAKE_INSTALL_LIBDIR} + $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 ${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) + diff --git a/sci-libs/exodusii/files/exodusii-5.26-multilib.patch b/sci-libs/exodusii/files/exodusii-5.26-multilib.patch new file mode 100644 index 000000000000..1d1c1fca6c2b --- /dev/null +++ b/sci-libs/exodusii/files/exodusii-5.26-multilib.patch @@ -0,0 +1,95 @@ + CMakeLists.txt | 6 +++--- + cbind/CMakeLists.txt | 6 +++--- + forbind/CMakeLists.txt | 12 ++++++------ + 3 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ca372f5..a071d99 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,7 +27,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${LIB_SUFFIX}" + "$ENV{NETCDF_DIR}/libsrc/.libs" + ) + +@@ -41,14 +41,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${LIB_SUFFIX} + $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${LIB_SUFFIX} + $ENV{NETCDF_DIR}/libsrc/.libs + /usr/local/hdf5/lib + ) +diff --git a/cbind/CMakeLists.txt b/cbind/CMakeLists.txt +index 083891f..66fd17b 100644 +--- a/cbind/CMakeLists.txt ++++ b/cbind/CMakeLists.txt +@@ -293,9 +293,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${LIB_SUFFIX} COMPONENT Runtime ++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT Development) + INSTALL(FILES ${cbind_HEADERS} DESTINATION include COMPONENT Development) + ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES) + +diff --git a/forbind/CMakeLists.txt b/forbind/CMakeLists.txt +index 5ee026c..66ba1b3 100644 +--- a/forbind/CMakeLists.txt ++++ b/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${LIB_SUFFIX}" + "$ENV{NETCDF_DIR}/libsrc/.libs" + ) + +@@ -28,14 +28,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${LIB_SUFFIX} + $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${LIB_SUFFIX} + $ENV{NETCDF_DIR}/libsrc/.libs + /usr/local/hdf5/lib + ) +@@ -61,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${LIB_SUFFIX} COMPONENT Runtime ++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT Development) + INSTALL(FILES ${forbind_HEADERS} DESTINATION include COMPONENT Development) + ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES) + |