/[gentoo-x86]/sci-physics/clhep/files/clhep-2.1.2.3-libdir.patch
Gentoo

Contents of /sci-physics/clhep/files/clhep-2.1.2.3-libdir.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Thu Jun 28 00:31:06 2012 UTC (2 years ago) by bicatali
Branch: MAIN
CVS Tags: HEAD
Version bump. Switch to cmake build, added patch to respect libdir

(Portage version: 2.1.11.1/cvs/Linux x86_64)

1 diff -Nur 2.1.2.3/CLHEP.orig/cmake/Modules/ClhepBuildLibrary.cmake 2.1.2.3/CLHEP/cmake/Modules/ClhepBuildLibrary.cmake
2 --- 2.1.2.3/CLHEP.orig/cmake/Modules/ClhepBuildLibrary.cmake 2012-06-27 20:47:44.000000000 +0100
3 +++ 2.1.2.3/CLHEP/cmake/Modules/ClhepBuildLibrary.cmake 2012-06-27 23:49:13.000000000 +0100
4 @@ -47,8 +47,8 @@
5 # Install the libraries
6 INSTALL (TARGETS ${package} ${package}S
7 RUNTIME DESTINATION bin
8 - LIBRARY DESTINATION lib
9 - ARCHIVE DESTINATION lib
10 + LIBRARY DESTINATION lib${LIB_SUFFIX}
11 + ARCHIVE DESTINATION lib${LIB_SUFFIX}
12 )
13 endmacro(clhep_build_library)
14
15 @@ -78,22 +78,22 @@
16 INSTALL(TARGETS CLHEP CLHEPS
17 EXPORT CLHEPLibraryDepends
18 RUNTIME DESTINATION bin
19 - LIBRARY DESTINATION lib
20 - ARCHIVE DESTINATION lib
21 + LIBRARY DESTINATION lib${LIB_SUFFIX}
22 + ARCHIVE DESTINATION lib${LIB_SUFFIX}
23 )
24
25 if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
26 # copy
27 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink
28 - "exec_program(${CMAKE_COMMAND} ARGS -E chdir ${CMAKE_INSTALL_PREFIX}/lib; ${CMAKE_COMMAND} ARGS -E copy ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} )" )
29 + "exec_program(${CMAKE_COMMAND} ARGS -E chdir $ENV{CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}; ${CMAKE_COMMAND} ARGS -E copy ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} )" )
30 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_shared_symlink
31 - "exec_program(${CMAKE_COMMAND} ARGS -E chdir ${CMAKE_INSTALL_PREFIX}/bin; ${CMAKE_COMMAND} ARGS -E copy ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} )" )
32 + "exec_program(${CMAKE_COMMAND} ARGS -E chdir $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin; ${CMAKE_COMMAND} ARGS -E copy ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} )" )
33 else()
34 # create the symbolic links
35 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink
36 - "exec_program(${CMAKE_COMMAND} ARGS -E chdir ${CMAKE_INSTALL_PREFIX}/lib; ${CMAKE_COMMAND} ARGS -E create_symlink ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} )" )
37 + "exec_program(${CMAKE_COMMAND} ARGS -E chdir $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}; ${CMAKE_COMMAND} ARGS -E create_symlink ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} )" )
38 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_shared_symlink
39 - "exec_program(${CMAKE_COMMAND} ARGS -E chdir ${CMAKE_INSTALL_PREFIX}/lib; ${CMAKE_COMMAND} ARGS -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} )" )
40 + "exec_program(${CMAKE_COMMAND} ARGS -E chdir $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}; ${CMAKE_COMMAND} ARGS -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} )" )
41 endif()
42
43 INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink )
44 diff -Nur 2.1.2.3/CLHEP.orig/cmake/Modules/ClhepToolchain.cmake 2.1.2.3/CLHEP/cmake/Modules/ClhepToolchain.cmake
45 --- 2.1.2.3/CLHEP.orig/cmake/Modules/ClhepToolchain.cmake 2012-06-27 20:47:44.000000000 +0100
46 +++ 2.1.2.3/CLHEP/cmake/Modules/ClhepToolchain.cmake 2012-06-27 23:39:28.000000000 +0100
47 @@ -63,7 +63,7 @@
48 #
49 set(CLHEP_PKGCONFIG_PREFIX ${PROJECT_BINARY_DIR})
50 set(CLHEP_PKGCONFIG_INCLUDEDIR ${CLHEP_INCLUDE_DIR})
51 -set(CLHEP_PKGCONFIG_LIBDIR ${PROJECT_BINARY_DIR}/lib)
52 +set(CLHEP_PKGCONFIG_LIBDIR ${PROJECT_BINARY_DIR}/lib${LIB_SUFFIX})
53
54 configure_file(${PROJECT_SOURCE_DIR}/cmake/Templates/clhep.pc.in
55 ${PROJECT_BINARY_DIR}/clhep.pc
56 @@ -84,7 +84,7 @@
57 # We use a relative path from the directory where the CLHEPConfig.cmake
58 # file is installed to the actual include dir.
59 file(RELATIVE_PATH _relincpath
60 - ${CMAKE_INSTALL_PREFIX}/lib/CLHEP-${VERSION}
61 + ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/CLHEP-${VERSION}
62 ${CMAKE_INSTALL_PREFIX}/include
63 )
64 set(CLHEP_INCLUDE_DIR "\${_thisdir}/${_relincpath}")
65 @@ -111,7 +111,7 @@
66 # If you later use GNUInstallDirs.cmake, this would need more work to
67 # ensure accurate calculation of the relative path.
68 set(CLHEP_PKGCONFIG_PREFIX "\${pcfiledir}/../..")
69 -set(CLHEP_PKGCONFIG_LIBDIR "\${prefix}/lib")
70 +set(CLHEP_PKGCONFIG_LIBDIR "\${prefix}/lib${LIB_SUFFIX}")
71 set(CLHEP_PKGCONFIG_INCLUDEDIR "\${prefix}/include")
72
73 configure_file(${PROJECT_SOURCE_DIR}/cmake/Templates/clhep.pc.in
74 @@ -129,16 +129,16 @@
75 install(FILES
76 ${PROJECT_BINARY_DIR}/InstallTreeFiles/CLHEPConfigVersion.cmake
77 ${PROJECT_BINARY_DIR}/InstallTreeFiles/CLHEPConfig.cmake
78 - DESTINATION lib/CLHEP-${VERSION}
79 + DESTINATION lib${LIB_SUFFIX}/CLHEP-${VERSION}
80 )
81
82 -install(EXPORT CLHEPLibraryDepends DESTINATION lib/CLHEP-${VERSION})
83 +install(EXPORT CLHEPLibraryDepends DESTINATION lib${LIB_SUFFIX}/CLHEP-${VERSION})
84
85 # Install the pkg-config file. The choice of 'lib/pkgconfig' for the
86 # installation seems fairly standard.
87 install(FILES
88 ${PROJECT_BINARY_DIR}/InstallTreeFiles/clhep.pc
89 - DESTINATION lib/pkgconfig
90 + DESTINATION lib${LIB_SUFFIX}/pkgconfig
91 )
92
93 # - And we should be done...

  ViewVC Help
Powered by ViewVC 1.1.20