Skip to content

Commit

Permalink
[openblas] Fix generating pkg-config file (#12956)
Browse files Browse the repository at this point in the history
  • Loading branch information
albertziegenhagel committed Aug 20, 2020
1 parent d48e2bd commit c3f69d4
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
2 changes: 1 addition & 1 deletion ports/openblas/CONTROL
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: openblas
Version: 0.3.9
Port-Version: 2
Port-Version: 3
Homepage: https://github.com/xianyi/OpenBLAS
Build-Depends: pthread (linux&osx)
Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.
19 changes: 19 additions & 0 deletions ports/openblas/fix-pkg-config.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c324e224..4b82d767 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -389,11 +389,9 @@ if(NOT NO_LAPACKE)
install (FILES ${CMAKE_BINARY_DIR}/lapacke_mangling.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openblas${SUFFIX64})
endif()

-include(FindPkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
- configure_file(${PROJECT_SOURCE_DIR}/cmake/openblas.pc.in ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc @ONLY)
- install (FILES ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/)
-endif()
+# Install pkg-config files
+configure_file(${PROJECT_SOURCE_DIR}/cmake/openblas.pc.in ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc @ONLY)
+install (FILES ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/)


# GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".
1 change: 1 addition & 0 deletions ports/openblas/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ vcpkg_from_github(
fix-space-path.patch
fix-redefinition-function.patch
github_2481.patch
fix-pkg-config.patch
)

find_program(GIT NAMES git git.cmd)
Expand Down

0 comments on commit c3f69d4

Please sign in to comment.