* [Buildroot] [PATCH 1/1] eigen: Fix pkg-config file prefix error
@ 2018-08-16 22:16 Matt Flax
2018-08-17 17:19 ` Peter Korsgaard
2018-08-24 8:47 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Matt Flax @ 2018-08-16 22:16 UTC (permalink / raw)
To: buildroot
From: Matt Flax <flatmax@flatmax.org>
eigen generates a pkg-config file which has a broken 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 and prjects
which depend on this pc file can now path correctly to the eigen include
directory at build time.
Signed-off-by: Matt Flax <flatmax@flatmax.org>
---
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 89f54fb..84e6f3a 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.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [Buildroot] [PATCH 1/1] eigen: Fix pkg-config file prefix error
2018-08-16 22:16 [Buildroot] [PATCH 1/1] eigen: Fix pkg-config file prefix error Matt Flax
@ 2018-08-17 17:19 ` Peter Korsgaard
2018-08-24 8:47 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2018-08-17 17:19 UTC (permalink / raw)
To: buildroot
>>>>> "Matt" == Matt Flax <flatmax@flatmax.com> writes:
> From: Matt Flax <flatmax@flatmax.org>
> eigen generates a pkg-config file which has a broken prefix. This broken
> prefix causes an incorrect path when other packages call
> pkg-config --cflags eigen
It wasn't clear from the description what this broken prefix was, so I
had a look:
grep '^prefix=' build/eigen-3.3.4/eigen3.pc.in
prefix=@CMAKE_INSTALL_PREFIX@
Which is indeed no good.
> This patch fixes the prefix in the generated eigen pc file and prjects
> which depend on this pc file can now path correctly to the eigen include
> directory at build time.
> Signed-off-by: Matt Flax <flatmax@flatmax.org>
> ---
> 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 89f54fb..84e6f3a 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,' \
Why are you escaping these '/' characters? The sed invocation uses , as
seperator, so / isn't special.
Committed with these backslashes dropped and the commit message tweaked,
thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread* [Buildroot] [PATCH 1/1] eigen: Fix pkg-config file prefix error
2018-08-16 22:16 [Buildroot] [PATCH 1/1] eigen: Fix pkg-config file prefix error Matt Flax
2018-08-17 17:19 ` Peter Korsgaard
@ 2018-08-24 8:47 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2018-08-24 8:47 UTC (permalink / raw)
To: buildroot
>>>>> "Matt" == Matt Flax <flatmax@flatmax.com> writes:
> From: Matt Flax <flatmax@flatmax.org>
> eigen generates a pkg-config file which has a broken 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 and prjects
> which depend on this pc file can now path correctly to the eigen include
> directory at build time.
> Signed-off-by: Matt Flax <flatmax@flatmax.org>
Committed to 2018.02.x and 2018.05.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-08-24 8:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-16 22:16 [Buildroot] [PATCH 1/1] eigen: Fix pkg-config file prefix error Matt Flax
2018-08-17 17:19 ` Peter Korsgaard
2018-08-24 8:47 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox