diff options
Diffstat (limited to 'meta/recipes-devtools/git/git.inc')
| -rw-r--r-- | meta/recipes-devtools/git/git.inc | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 4da4a2754f..ade99ecfe0 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -17,7 +17,8 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \ --without-tcltk \ " -inherit autotools-brokensep perlnative +# Needs brokensep as this doesn't use automake +inherit autotools-brokensep perlnative bash-completion EXTRA_OEMAKE = "NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" EXTRA_OEMAKE += "'PERL_PATH=/usr/bin/env perl'" @@ -31,8 +32,7 @@ do_compile_prepend () { do_install () { oe_runmake install DESTDIR="${D}" bindir=${bindir} \ - template_dir=${datadir}/git-core/templates \ - GIT_PYTHON_DIR=${D}${datadir}/git-core/python + template_dir=${datadir}/git-core/templates install -d ${D}/${mandir}/man1 install -d ${D}/${mandir}/man5 install -d ${D}/${mandir}/man7 @@ -46,10 +46,12 @@ do_install () { perl_native_fixup () { sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \ -e 's#${libdir}/perl-native/#${libdir}/#' \ - ${@d.getVar("PERLTOOLS", True).replace(' /',d.getVar('D', True) + '/')} + ${@d.getVar("PERLTOOLS").replace(' /',d.getVar('D') + '/')} # ${libdir} is not applicable here, perl-native files are always # installed to /usr/lib on both 32/64 bits targets. + + mkdir -p ${D}${libdir} mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${libdir} rmdir -p ${D}${exec_prefix}/lib/perl-native || true } @@ -75,7 +77,6 @@ do_install_append_class-nativesdk() { } FILES_${PN} += "${datadir}/git-core ${libexecdir}/git-core/" -FILES_${PN}-dbg += "${libexecdir}/git-core/.debug" PERLTOOLS = " \ ${libexecdir}/git-core/git-add--interactive \ @@ -97,10 +98,6 @@ PERLTOOLS = " \ ${datadir}/git-core/templates/hooks/pre-rebase.sample \ " -# Basic tab completion support -PACKAGES =+ "${PN}-bash-completion" -FILES_${PN}-bash-completion = "${datadir}/bash-completion/completions/*" - # Git tools requiring perl PACKAGES =+ "${PN}-perltools" FILES_${PN}-perltools += " \ @@ -110,10 +107,6 @@ FILES_${PN}-perltools += " \ " RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" -PACKAGES =+ "${PN}-python" -FILES_${PN}-python = "${libdir}/python*" - - # git-tk package with gitk and git-gui PACKAGES =+ "${PN}-tk" #RDEPENDS_${PN}-tk = "${PN} tk tcl" |