diff options
author | Christopher Larson <chris_larson@mentor.com> | 2013-12-13 07:50:11 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-16 12:13:58 +0000 |
commit | 31f94def9a8ed44c4c79bd2a2f6665729c903824 (patch) | |
tree | 2061fe49ef0f86e183a105712aab30b105a01028 /meta | |
parent | 4274ee5c14985bc51c9ad4855abdfb8c61cb04fd (diff) | |
download | poky-31f94def9a8ed44c4c79bd2a2f6665729c903824.tar.gz |
git: leverage upstream relocation support
(From OE-Core rev: 4fe4b432b7323a73144f317f8bbbd09c9d9fcb77)
Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/git/git.inc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 183a93cde6..f33069c7ca 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 \ | |||
16 | 16 | ||
17 | inherit autotools perlnative | 17 | inherit autotools perlnative |
18 | 18 | ||
19 | EXTRA_OEMAKE = "NO_PYTHON=1" | 19 | EXTRA_OEMAKE = "NO_PYTHON=1 RUNTIME_PREFIX=1" |
20 | 20 | ||
21 | do_compile_prepend () { | 21 | do_compile_prepend () { |
22 | # 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 |
@@ -35,18 +35,6 @@ do_install () { | |||
35 | rmdir ${D}${exec_prefix}/lib || true | 35 | rmdir ${D}${exec_prefix}/lib || true |
36 | } | 36 | } |
37 | 37 | ||
38 | do_install_append_class-native() { | ||
39 | create_wrapper ${D}/${bindir}/git \ | ||
40 | GIT_EXEC_PATH=${libexecdir}/git-core \ | ||
41 | GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates | ||
42 | } | ||
43 | |||
44 | do_install_append_class-nativesdk() { | ||
45 | create_wrapper ${D}/${bindir}/git \ | ||
46 | GIT_EXEC_PATH=${libexecdir}/git-core \ | ||
47 | GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates | ||
48 | } | ||
49 | |||
50 | FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/" | 38 | FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/" |
51 | FILES_${PN}-dbg += "${libexecdir}/git-core/.debug" | 39 | FILES_${PN}-dbg += "${libexecdir}/git-core/.debug" |
52 | 40 | ||