math/armadillo: Use USES=pathfix
The original pkgconfig hack has been split into CMAKE_ARGS and CMakeLists.txt patch.
This commit is contained in:
parent
e1b86292ff
commit
09f340011f
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= armadillo
|
||||
DISTVERSION= 12.6.7
|
||||
PORTVERSION= 12.6.7
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= math
|
||||
MASTER_SITES= SF/arma
|
||||
|
@ -15,10 +15,9 @@ LIB_DEPENDS= libarpack.so:math/arpack-ng \
|
|||
liblapack.so:math/lapack \
|
||||
libsuperlu.so:math/superlu
|
||||
|
||||
USES= blaslapack:openblas cmake:testing compiler:c++11-lang pkgconfig tar:xz
|
||||
USES= blaslapack:openblas cmake:testing compiler:c++11-lang pathfix pkgconfig tar:xz
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
CMAKE_ARGS+= -DPKG_CONFIG_DIR=${LOCALBASE}/libdata/pkgconfig/
|
||||
CMAKE_OFF= BUILD_SMOKE_TEST
|
||||
CMAKE_TESTING_ON= BUILD_SMOKE_TEST
|
||||
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
--- CMakeLists.txt.orig 2017-05-08 13:46:28 UTC
|
||||
+++ CMakeLists.txt
|
||||
@@ -484,4 +484,4 @@ file(COPY ${PROJECT_SOURCE_DIR}/misc/ DE
|
||||
message(STATUS "Generating '${PROJECT_BINARY_DIR}/tmp/misc/armadillo.pc'")
|
||||
configure_file(${PROJECT_BINARY_DIR}/tmp/misc/armadillo.pc.in "${PROJECT_BINARY_DIR}/tmp/misc/armadillo.pc" @ONLY)
|
||||
|
||||
-install(FILES "${PROJECT_BINARY_DIR}/tmp/misc/armadillo.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
||||
+install(FILES "${PROJECT_BINARY_DIR}/tmp/misc/armadillo.pc" DESTINATION ${PKG_CONFIG_DIR})
|
Loading…
Reference in New Issue