From 3b2f763188ed059b1706fec9f85531b8ce937f2d Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Thu, 22 Mar 2018 14:58:18 +1100
Subject: cblas lapack: fixup pkg-config calls
see: https://github.com/Reference-LAPACK/lapack/pull/119#issuecomment-374809776
---
src/cblas.mk | 3 ++-
src/lapack.mk | 7 +++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/cblas.mk b/src/cblas.mk
index b8c91e8..3c5c1b3 100644
--- a/src/cblas.mk
+++ b/src/cblas.mk
@@ -28,8 +28,9 @@ define $(PKG)_BUILD
'$(TARGET)-gfortran' \
-W -Wall -Werror -ansi -pedantic \
'$(SOURCE_DIR)/CBLAS/examples/cblas_example1.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
- `'$(TARGET)-pkg-config' $(PKG) blas --cflags --libs`
+ `'$(TARGET)-pkg-config' $(PKG) --cflags --libs`
+ # if blas routines are used directly, add to pkg-config call
'$(TARGET)-gfortran' \
-W -Wall -Werror -ansi -pedantic \
'$(SOURCE_DIR)/CBLAS/examples/cblas_example2.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-F77.exe' \
diff --git a/src/lapack.mk b/src/lapack.mk
index 88387f8..9e34433 100644
--- a/src/lapack.mk
+++ b/src/lapack.mk
@@ -20,15 +20,14 @@ define $(PKG)_BUILD
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
$(MAKE) -C '$(BUILD_DIR)' -j 1 install
- # pkg-config files don't pick up deps correctly
- # see https://github.com/Reference-LAPACK/lapack/pull/119
+ # if blas/cblas routines are used directly, add to pkg-config call
'$(TARGET)-gfortran' \
-W -Wall -Werror -pedantic \
'$(PWD)/src/$(PKG)-test.f' -o '$(PREFIX)/$(TARGET)/bin/test-lapack.exe' \
- `'$(TARGET)-pkg-config' $(PKG) blas --cflags --libs`
+ `'$(TARGET)-pkg-config' $(PKG) --cflags --libs`
'$(TARGET)-gfortran' \
-W -Wall -Werror -pedantic \
'$(PWD)/src/$(PKG)-test.c' -o '$(PREFIX)/$(TARGET)/bin/test-lapacke.exe' \
- `'$(TARGET)-pkg-config' lapacke lapack cblas blas --cflags --libs`
+ `'$(TARGET)-pkg-config' lapacke cblas --cflags --libs`
endef
--
cgit v0.12