summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/git/git.inc32
-rw-r--r--meta/recipes-devtools/git/git_1.7.4.3.bb2
2 files changed, 31 insertions, 3 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 843a1d3511..7f12859792 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -14,11 +14,39 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl --without-tcltk"
14inherit autotools 14inherit autotools
15 15
16do_install () { 16do_install () {
17 oe_runmake install DESTDIR="${D}" bindir=${bindir} gitexecdir=${gitexecdir} \ 17 oe_runmake install DESTDIR="${D}" bindir=${bindir} \
18 template_dir=${datadir}/git-core/templates \ 18 template_dir=${datadir}/git-core/templates \
19 GIT_PYTHON_DIR=${D}${datadir}/git-core/python 19 GIT_PYTHON_DIR=${D}${datadir}/git-core/python
20} 20}
21 21
22FILES_${PN} += "${datadir}/git-core" 22FILES_${PN} += "${datadir}/git-core ${libxecdir}/git-core/"
23FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"
24
25# Git tools requiring perl
26PACKAGES =+ "${PN}-perltools"
27FILES_${PN}-perltools += " \
28 ${libexecdir}/git-core/git-add--interactive \
29 ${libexecdir}/git-core/git-archimport \
30 ${libexecdir}/git-core/git-cvsexportcommit \
31 ${libexecdir}/git-core/git-cvsimport \
32 ${libexecdir}/git-core/git-cvsserver \
33 ${bindir}/git-cvsserver \
34 ${libexecdir}/git-core/git-difftool \
35 ${libexecdir}/git-core/git-relink \
36 ${libexecdir}/git-core/git-send-email \
37 ${libexecdir}/git-core/git-svn \
38 ${datadir}/perl \
39"
40RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils"
41
42# git-tk package with gitk and git-gui
43PACKAGES =+ "${PN}-tk"
44RDEPENDS_${PN}-tk = "${PN} tk tcl"
45EXTRA_OEMAKE = "TCL_PATH=${STAGING_BINDIR_CROSS}/tclsh"
46FILES_${PN}-tk = " \
47 ${bindir}/gitk \
48 ${datadir}/gitk \
49"
50
23 51
24BBCLASSEXTEND = "native" 52BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/git/git_1.7.4.3.bb b/meta/recipes-devtools/git/git_1.7.4.3.bb
index 2ff1ed512e..45ef61b5e5 100644
--- a/meta/recipes-devtools/git/git_1.7.4.3.bb
+++ b/meta/recipes-devtools/git/git_1.7.4.3.bb
@@ -1,6 +1,6 @@
1require git.inc 1require git.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \ 5EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
6 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ 6 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \