lapack-reference-3.6.0-fix-build-system.patch 4.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125
  1. BLAS/CMakeLists.txt | 2 +-
  2. BLAS/blas.pc.in | 6 ++++--
  3. CBLAS/CMakeLists.txt | 2 +-
  4. CBLAS/cblas.pc.in | 9 ++++++---
  5. CMakeLists.txt | 2 +-
  6. LAPACKE/CMakeLists.txt | 2 +-
  7. LAPACKE/lapacke.pc.in | 6 ++++--
  8. lapack.pc.in | 6 ++++--
  9. 8 files changed, 22 insertions(+), 13 deletions(-)
  10. diff --git a/BLAS/CMakeLists.txt b/BLAS/CMakeLists.txt
  11. index 45e68e9..56c8354 100644
  12. --- a/BLAS/CMakeLists.txt
  13. +++ b/BLAS/CMakeLists.txt
  14. @@ -2,7 +2,7 @@ add_subdirectory(SRC)
  15. if(BUILD_TESTING)
  16. add_subdirectory(TESTING)
  17. endif(BUILD_TESTING)
  18. -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
  19. +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
  20. install(FILES
  21. ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
  22. DESTINATION ${PKG_CONFIG_DIR}
  23. diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
  24. index 845a25c..7a53ea5 100644
  25. --- a/BLAS/blas.pc.in
  26. +++ b/BLAS/blas.pc.in
  27. @@ -1,5 +1,7 @@
  28. -prefix=@prefix@
  29. -libdir=@libdir@
  30. +prefix=@CMAKE_INSTALL_PREFIX@
  31. +exec_prefix=${prefix}
  32. +libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
  33. +includedir=${prefix}/include
  34. Name: blas
  35. Description: Basic Linear Algebra Subprograms F77 reference implementations
  36. diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
  37. index 98b481f..8f98b04 100644
  38. --- a/CBLAS/CMakeLists.txt
  39. +++ b/CBLAS/CMakeLists.txt
  40. @@ -71,7 +71,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/cblas-config-build.cmake.in
  41. ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
  42. -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
  43. +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
  44. install(FILES
  45. ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
  46. DESTINATION ${PKG_CONFIG_DIR}
  47. diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
  48. index ee20206..14a141e 100644
  49. --- a/CBLAS/cblas.pc.in
  50. +++ b/CBLAS/cblas.pc.in
  51. @@ -1,9 +1,12 @@
  52. -prefix=@prefix@
  53. -libdir=@libdir@
  54. +prefix=@CMAKE_INSTALL_PREFIX@
  55. +exec_prefix=${prefix}
  56. +libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
  57. +includedir=${prefix}/include/@PROFNAME@
  58. -Name: lapacke
  59. +Name: cblas-reference
  60. Description: C Standard Interface to BLAS Linear Algebra PACKage
  61. Version: @LAPACK_VERSION@
  62. URL: http://www.netlib.org/lapack/
  63. Libs: -L${libdir} -lcblas
  64. +Cflags: -I${includedir}
  65. Requires: blas
  66. diff --git a/CMakeLists.txt b/CMakeLists.txt
  67. index ab29bd2..31b878a 100644
  68. --- a/CMakeLists.txt
  69. +++ b/CMakeLists.txt
  70. @@ -333,7 +333,7 @@ configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
  71. ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
  72. -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
  73. +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
  74. install(FILES
  75. ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
  76. DESTINATION ${PKG_CONFIG_DIR}
  77. diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
  78. index 008f24c..d8c4cb0 100644
  79. --- a/LAPACKE/CMakeLists.txt
  80. +++ b/LAPACKE/CMakeLists.txt
  81. @@ -65,7 +65,7 @@ if(BUILD_TESTING)
  82. endif(BUILD_TESTING)
  83. -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
  84. +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
  85. install(FILES
  86. ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
  87. DESTINATION ${PKG_CONFIG_DIR}
  88. diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
  89. index 75e6871..ce5201b 100644
  90. --- a/LAPACKE/lapacke.pc.in
  91. +++ b/LAPACKE/lapacke.pc.in
  92. @@ -1,5 +1,7 @@
  93. -prefix=@prefix@
  94. -libdir=@libdir@
  95. +prefix=@CMAKE_INSTALL_PREFIX@
  96. +exec_prefix=${prefix}
  97. +libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
  98. +includedir=${prefix}/include
  99. Name: lapacke
  100. Description: C Standard Interface to LAPACK Linear Algebra PACKage
  101. diff --git a/lapack.pc.in b/lapack.pc.in
  102. index d34c870..0d0750f 100644
  103. --- a/lapack.pc.in
  104. +++ b/lapack.pc.in
  105. @@ -1,5 +1,7 @@
  106. -prefix=@prefix@
  107. -libdir=@libdir@
  108. +prefix=@CMAKE_INSTALL_PREFIX@
  109. +exec_prefix=${prefix}
  110. +libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
  111. +includedir=${prefix}/include
  112. Name: lapack
  113. Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage