diff options
Diffstat (limited to 'meta/recipes-devtools/git/git.inc')
-rw-r--r-- | meta/recipes-devtools/git/git.inc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 8c85adeda6..9ed13dba39 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc | |||
@@ -15,7 +15,7 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \ | |||
15 | 15 | ||
16 | inherit autotools-brokensep perlnative | 16 | inherit autotools-brokensep perlnative |
17 | 17 | ||
18 | EXTRA_OEMAKE = "NO_PYTHON=1 RUNTIME_PREFIX=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" | 18 | EXTRA_OEMAKE = "NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" |
19 | EXTRA_OEMAKE_append_class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1" | 19 | EXTRA_OEMAKE_append_class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1" |
20 | 20 | ||
21 | do_compile_prepend () { | 21 | do_compile_prepend () { |
@@ -41,11 +41,23 @@ PERLSEDFIXUP = " \ | |||
41 | ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')} \ | 41 | ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')} \ |
42 | " | 42 | " |
43 | 43 | ||
44 | REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core" | ||
45 | REL_GIT_TEMPLATE_DIR = "${@os.path.relpath(datadir, bindir)}/git-core/templates" | ||
46 | |||
44 | do_install_append_class-target () { | 47 | do_install_append_class-target () { |
45 | ${PERLSEDFIXUP} | 48 | ${PERLSEDFIXUP} |
46 | } | 49 | } |
47 | 50 | ||
48 | do_install_append_class-nativesdk () { | 51 | do_install_append_class-native() { |
52 | create_wrapper ${D}${bindir}/git \ | ||
53 | GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ | ||
54 | GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} | ||
55 | } | ||
56 | |||
57 | do_install_append_class-nativesdk() { | ||
58 | create_wrapper ${D}${bindir}/git \ | ||
59 | GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ | ||
60 | GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} | ||
49 | ${PERLSEDFIXUP} | 61 | ${PERLSEDFIXUP} |
50 | } | 62 | } |
51 | 63 | ||