From patchwork Tue May 3 23:44:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [27/33] git: Disable gitk from by default Date: Tue, 03 May 2011 23:44:56 -0000 From: Saul Wold X-Patchwork-Id: 3167 Message-Id: <9672b6965c6d8f86c43f0253b02d891ced35363d.1304465724.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org Cc: Xiaofeng Yan , Ilya Yanok , Darren Hart , Paul Eggleton , Kang Kai , Koen Kooi From: Saul Wold 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 --- 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} \