/[gentoo-x86]/sci-physics/clhep/files/clhep-2.1.2.4-lsb-whitespace.patch
Gentoo

Contents of /sci-physics/clhep/files/clhep-2.1.2.4-lsb-whitespace.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Tue Aug 14 20:17:27 2012 UTC (2 years, 4 months ago) by bicatali
Branch: MAIN
CVS Tags: HEAD
Fix when lsb_release is installed by stripping whitespaces, bug #430656

(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)

1 diff -Nur cmake/Modules.orig/ClhepPackageCompiler.cmake cmake/Modules/ClhepPackageCompiler.cmake
2 --- cmake/Modules.orig/ClhepPackageCompiler.cmake 2012-08-14 13:07:41.891381108 -0700
3 +++ cmake/Modules/ClhepPackageCompiler.cmake 2012-08-14 13:08:39.826695769 -0700
4 @@ -16,6 +16,7 @@
5 execute_process(COMMAND ${CMAKE_CXX_COMPILER}
6 ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
7 OUTPUT_VARIABLE _my_COMPILER_VERSION
8 + OUTPUT_STRIP_TRAILING_WHITESPACE
9 )
10 set( COMPILER_VERSION ${_my_COMPILER_VERSION} PARENT_SCOPE)
11 STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
12 diff -Nur cmake/Modules.orig/ClhepPackaging.cmake cmake/Modules/ClhepPackaging.cmake
13 --- cmake/Modules.orig/ClhepPackaging.cmake 2012-08-14 13:07:41.890381099 -0700
14 +++ cmake/Modules/ClhepPackaging.cmake 2012-08-14 13:08:17.025571936 -0700
15 @@ -68,7 +68,7 @@
16 # We have linux, so incorporate Vendor info into package name
17 # - Distributor ID
18 ##exec_program(${LSB_RELEASE_PROGRAM} ARGS -s -i OUTPUT_VARIABLE LSB_VENDOR)
19 - execute_process(COMMAND ${LSB_RELEASE_PROGRAM} -s -i OUTPUT_VARIABLE LSB_VENDOR)
20 + execute_process(COMMAND ${LSB_RELEASE_PROGRAM} -s -i OUTPUT_VARIABLE LSB_VENDOR OUTPUT_STRIP_TRAILING_WHITESPACE)
21 string(REGEX REPLACE " " "-" LSB_VENDOR ${LSB_VENDOR})
22 string(TOLOWER ${LSB_VENDOR} LSB_VENDOR)
23 if("${LSB_VENDOR}" MATCHES "scientificslf")
24 @@ -85,7 +85,7 @@
25
26 # - Distributor release
27 ##exec_program(${LSB_RELEASE_PROGRAM} ARGS -s -r OUTPUT_VARIABLE LSB_RELEASE)
28 - execute_process(COMMAND ${LSB_RELEASE_PROGRAM} -s -r OUTPUT_VARIABLE LSB_RELEASE)
29 + execute_process(COMMAND ${LSB_RELEASE_PROGRAM} -s -r OUTPUT_VARIABLE LSB_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
30 string(TOLOWER ${LSB_RELEASE} LSB_RELEASE)
31 string(REGEX REPLACE "([0-9])\\.([0-9])?" "\\1" LSB_RELEASE ${LSB_RELEASE})
32

  ViewVC Help
Powered by ViewVC 1.1.20