diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/git/git.inc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 7633577f67..25158330b6 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc | |||
@@ -30,24 +30,21 @@ do_install () { | |||
30 | oe_runmake install DESTDIR="${D}" bindir=${bindir} \ | 30 | oe_runmake install DESTDIR="${D}" bindir=${bindir} \ |
31 | template_dir=${datadir}/git-core/templates \ | 31 | template_dir=${datadir}/git-core/templates \ |
32 | GIT_PYTHON_DIR=${D}${datadir}/git-core/python | 32 | GIT_PYTHON_DIR=${D}${datadir}/git-core/python |
33 | |||
34 | # ${libdir} is not applicable here, perl-native files are always | ||
35 | # installed to /usr/lib on both 32/64 bits targets. | ||
36 | rm -rf ${D}${exec_prefix}/lib/perl-native | ||
37 | rmdir ${D}${exec_prefix}/lib || true | ||
38 | } | 33 | } |
39 | 34 | ||
40 | PERLSEDFIXUP = " \ | 35 | perl_native_fixup () { |
41 | sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \ | 36 | sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \ |
42 | -e 's#${libdir}/perl-native/#${libdir}/#' \ | 37 | -e 's#${libdir}/perl-native/#${libdir}/#' \ |
43 | ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')} \ | 38 | ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')} |
44 | " | 39 | mv ${D}${libdir}/perl-native/perl ${D}${libdir} |
40 | rmdir ${D}${libdir}/perl-native || true | ||
41 | } | ||
45 | 42 | ||
46 | REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core" | 43 | REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core" |
47 | REL_GIT_TEMPLATE_DIR = "${@os.path.relpath(datadir, bindir)}/git-core/templates" | 44 | REL_GIT_TEMPLATE_DIR = "${@os.path.relpath(datadir, bindir)}/git-core/templates" |
48 | 45 | ||
49 | do_install_append_class-target () { | 46 | do_install_append_class-target () { |
50 | ${PERLSEDFIXUP} | 47 | perl_native_fixup |
51 | } | 48 | } |
52 | 49 | ||
53 | do_install_append_class-native() { | 50 | do_install_append_class-native() { |
@@ -60,7 +57,7 @@ do_install_append_class-nativesdk() { | |||
60 | create_wrapper ${D}${bindir}/git \ | 57 | create_wrapper ${D}${bindir}/git \ |
61 | GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ | 58 | GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ |
62 | GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} | 59 | GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} |
63 | ${PERLSEDFIXUP} | 60 | perl_native_fixup |
64 | } | 61 | } |
65 | 62 | ||
66 | FILES_${PN} += "${datadir}/git-core ${libexecdir}/git-core/" | 63 | FILES_${PN} += "${datadir}/git-core ${libexecdir}/git-core/" |
@@ -90,6 +87,7 @@ PERLTOOLS = " \ | |||
90 | PACKAGES =+ "${PN}-perltools" | 87 | PACKAGES =+ "${PN}-perltools" |
91 | FILES_${PN}-perltools += " \ | 88 | FILES_${PN}-perltools += " \ |
92 | ${PERLTOOLS} \ | 89 | ${PERLTOOLS} \ |
90 | ${libdir}/perl \ | ||
93 | ${datadir}/perl \ | 91 | ${datadir}/perl \ |
94 | " | 92 | " |
95 | RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" | 93 | RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" |