From: Saul Wold <s...@linux.intel.com> gitk should not be built for native and comment out the build for the target by default since it includes tk and will drag in more X11 stuf then needed.
Signed-off-by: Saul Wold <s...@linux.intel.com> --- meta/recipes-devtools/git/git.inc | 7 +++++-- meta/recipes-devtools/git/git_1.7.4.3.bb | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 7f12859..725473a 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -40,9 +40,12 @@ FILES_${PN}-perltools += " \ RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" # git-tk package with gitk and git-gui -PACKAGES =+ "${PN}-tk" +# Uncomment the PACKAGE line to include GITK +#PACKAGES =+ "${GITK}" +GITK = "${PN}-tk" +GITK_virtclass-native = "" RDEPENDS_${PN}-tk = "${PN} tk tcl" -EXTRA_OEMAKE = "TCL_PATH=${STAGING_BINDIR_CROSS}/tclsh" +EXTRA_OEMAKE_${PN}-tk_append = " TCL_PATH=${STAGING_BINDIR_NATIVE}/tclsh" FILES_${PN}-tk = " \ ${bindir}/gitk \ ${datadir}/gitk \ 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 45ef61b..e45edcb 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 @@ require git.inc -PR = "r2" +PR = "r4" 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} \ -- 1.7.4.1 _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core