Patchwork git: Fix various makefile flags

login
register
mail settings
Submitter Richard Purdie
Date May 12, 2014, 10:04 a.m.
Message ID <1399889066.31891.126.camel@ted>
Download mbox | patch
Permalink /patch/71917/
State New
Headers show

Comments

Richard Purdie - May 12, 2014, 10:04 a.m.
We need to pass CFLAGS and LDFLAGS to the makefile correctly so we
need to list them as part of EXTRA_OEMAKE.

We also have a problem where git hardlinks binaries in bindir with
those in its libexecdir. If we change the RPATH in one of them, it
breaks the other. We therefore set the no cross dir hardlinking flag
git already has for this kind of issue. This ensures the RPATHS for
the git-core binaries works correctly. Its pure luck this has
sometimes worked so far.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Koen Kooi - May 12, 2014, 11:12 a.m.
Op 12 mei 2014, om 12:04 heeft Richard Purdie <richard.purdie@linuxfoundation.org> het volgende geschreven:

> We need to pass CFLAGS and LDFLAGS to the makefile correctly so we
> need to list them as part of EXTRA_OEMAKE.
> 
> We also have a problem where git hardlinks binaries in bindir with
> those in its libexecdir. If we change the RPATH in one of them, it
> breaks the other. We therefore set the no cross dir hardlinking flag
> git already has for this kind of issue. This ensures the RPATHS for
> the git-core binaries works correctly. Its pure luck this has
> sometimes worked so far.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

This fixes the libcrypto errors I was seeing, so:

Tested-by: Koen Kooi <koen.kooi@linaro.org>

--
Koen Kooi
Builds and Baselines | Release Manager
Linaro.org | Open source software for ARM SoCs

Patch

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index f5013f1..ad0ad1b 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -15,7 +15,8 @@  EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
 
 inherit autotools-brokensep perlnative
 
-EXTRA_OEMAKE = "NO_PYTHON=1 RUNTIME_PREFIX=1"
+EXTRA_OEMAKE = "NO_PYTHON=1 RUNTIME_PREFIX=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
+EXTRA_OEMAKE_append_class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1"
 
 do_compile_prepend () {
 	# Remove perl/perl.mak to fix the out-of-date perl.mak error