cblas lapack: fixup pkg-config calls

see: https://github.com/Reference-LAPACK/lapack/pull/119#issuecomment-374809776
This commit is contained in:
Tony Theodore 2018-03-22 14:58:18 +11:00
parent 66de72169a
commit 3b2f763188
2 changed files with 5 additions and 5 deletions

View File

@ -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' \

View File

@ -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