From 9b2e7dcb8cbf00670954d8314f4a8f97b674274d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 12 May 2014 11:04:26 +0100 Subject: git: Fix various makefile flags 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. (From OE-Core rev: 64c6ae6a69215b659b82c67e238bc0fbc09a3eab) Signed-off-by: Richard Purdie --- meta/recipes-devtools/git/git.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index f5013f1410..ad0ad1b026 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 -- cgit 1.2.3-korg