Patchwork [3/3] git: leverage upstream relocation support

login
register
mail settings
Submitter Christopher Larson
Date Dec. 13, 2013, 2:50 p.m.
Message ID <9950f35b110f1c3032e199c9d0b32a2e43a326b2.1386946076.git.kergoth@gmail.com>
Download mbox | patch
Permalink /patch/63339/
State New
Headers show

Comments

Christopher Larson - Dec. 13, 2013, 2:50 p.m.
From: Christopher Larson <chris_larson@mentor.com>

Signed-off-by: Christopher Larson <kergoth@gmail.com>
---
 meta/recipes-devtools/git/git.inc | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

Patch

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 183a93c..f33069c 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -16,7 +16,7 @@  EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
 
 inherit autotools perlnative
 
-EXTRA_OEMAKE = "NO_PYTHON=1"
+EXTRA_OEMAKE = "NO_PYTHON=1 RUNTIME_PREFIX=1"
 
 do_compile_prepend () {
 	# Remove perl/perl.mak to fix the out-of-date perl.mak error
@@ -35,18 +35,6 @@  do_install () {
 	rmdir ${D}${exec_prefix}/lib || true
 }
 
-do_install_append_class-native() {
-	create_wrapper ${D}/${bindir}/git \
-		GIT_EXEC_PATH=${libexecdir}/git-core \
-		GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates
-}
-
-do_install_append_class-nativesdk() {
-	create_wrapper ${D}/${bindir}/git \
-		GIT_EXEC_PATH=${libexecdir}/git-core \
-		GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates
-}
-
 FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/"
 FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"