diff options
Diffstat (limited to 'meta/recipes-devtools/git')
| -rw-r--r-- | meta/recipes-devtools/git/git.inc | 19 | ||||
| -rw-r--r-- | meta/recipes-devtools/git/git_2.11.1.bb | 11 | ||||
| -rw-r--r-- | meta/recipes-devtools/git/git_2.3.0.bb | 11 |
3 files changed, 17 insertions, 24 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" diff --git a/meta/recipes-devtools/git/git_2.11.1.bb b/meta/recipes-devtools/git/git_2.11.1.bb new file mode 100644 index 0000000000..f2f072c529 --- /dev/null +++ b/meta/recipes-devtools/git/git_2.11.1.bb @@ -0,0 +1,11 @@ +require git.inc + +EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ + ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ + " +EXTRA_OEMAKE += "NO_GETTEXT=1" + +SRC_URI[tarball.md5sum] = "6a7a73db076bb0514b602720669d685c" +SRC_URI[tarball.sha256sum] = "a1cdd7c820f92c44abb5003b36dc8cb7201ba38e8744802399f59c97285ca043" +SRC_URI[manpages.md5sum] = "e4268a6b514ccdb624b6450ff55881a3" +SRC_URI[manpages.sha256sum] = "ee567e7b0f95333816793714bb31c54e288cf8041f77a0092b85e62c9c2974f9" diff --git a/meta/recipes-devtools/git/git_2.3.0.bb b/meta/recipes-devtools/git/git_2.3.0.bb deleted file mode 100644 index 1611f6421b..0000000000 --- a/meta/recipes-devtools/git/git_2.3.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require git.inc - -SRC_URI[tarball.md5sum] = "edf994cf34cd3354dadcdfa6b4292335" -SRC_URI[tarball.sha256sum] = "ba2fe814e709a5d0f034ebe82083fce7feed0899b3a8c8b3adf1c5a85d1ce9ac" -SRC_URI[manpages.md5sum] = "620797eb73b281d0706979ae8038bbd7" -SRC_URI[manpages.sha256sum] = "8aa4d1e5d7bbf5641a9de92279369d9b20cc266ba7b2888104efa40e80b53559" - -EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \ - ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ - " -EXTRA_OEMAKE += "NO_GETTEXT=1" |