summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-12 11:04:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-29 13:42:24 +0100
commit6d898aef4c8130fe1c702c5bc144e0320ce2e33e (patch)
treebc6462c1279bfed27e69ec3195642a4f67ca3b55
parent412cb58083092815a45f1f349f378d34db31b46d (diff)
downloadpoky-6d898aef4c8130fe1c702c5bc144e0320ce2e33e.tar.gz
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) (From OE-Core rev: 9b2e7dcb8cbf00670954d8314f4a8f97b674274d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/git/git.inc3
1 files changed, 2 insertions, 1 deletions
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 \
15 15
16inherit autotools-brokensep perlnative 16inherit autotools-brokensep perlnative
17 17
18EXTRA_OEMAKE = "NO_PYTHON=1 RUNTIME_PREFIX=1" 18EXTRA_OEMAKE = "NO_PYTHON=1 RUNTIME_PREFIX=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
19EXTRA_OEMAKE_append_class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1"
19 20
20do_compile_prepend () { 21do_compile_prepend () {
21 # Remove perl/perl.mak to fix the out-of-date perl.mak error 22 # Remove perl/perl.mak to fix the out-of-date perl.mak error