aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Matt Flax <flatmax@flatmax.org>2018-08-17 08:16:20 +1000
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-08-17 19:20:23 +0200
commite477dc19b5264c8fd01ff235dded4f148fde7a65 (patch)
treeca0f56d1c3087705aa6969b48418cac3da2120c3
parentae977e942893ac7e5c9b69418f047acae1603c27 (diff)
downloadbuildroot-e477dc19b5264c8fd01ff235dded4f148fde7a65.tar.gz
buildroot-e477dc19b5264c8fd01ff235dded4f148fde7a65.tar.bz2
eigen: Fix pkg-config file prefix error
eigen generates a pkg-config file which has a broken prefix (@CMAKE_INSTALL_PREFIX@). This broken prefix causes an incorrect path when other packages call pkg-config --cflags eigen. This patch fixes the prefix in the generated eigen pc file, so projects which depend on this pc file can now correctly find the eigen include directory at build time. Also correct the Cflags output to use the runtime prefix instead of the build time STAGING_DIR, like we do elsewhere. [Peter: drop backslashes, tweak commit message] Signed-off-by: Matt Flax <flatmax@flatmax.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/eigen/eigen.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk
index 89f54fb948..27c4e212a9 100644
--- a/package/eigen/eigen.mk
+++ b/package/eigen/eigen.mk
@@ -23,7 +23,8 @@ endif
# Generate the .pc file at build time
define EIGEN_BUILD_CMDS
sed -r -e 's,^Version: .*,Version: $(EIGEN_VERSION),' \
- -e 's,^Cflags: .*,Cflags: -I$(EIGEN_DEST_DIR),' \
+ -e 's,^Cflags: .*,Cflags: -I$$\{prefix\}/include/eigen3,' \
+ -e 's,^prefix.*,prefix=/usr,' \
$(@D)/eigen3.pc.in >$(@D)/eigen3.pc
endef