From e477dc19b5264c8fd01ff235dded4f148fde7a65 Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Fri, 17 Aug 2018 08:16:20 +1000 Subject: [PATCH] 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 Signed-off-by: Peter Korsgaard --- package/eigen/eigen.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- 2.30.2