From 654a9ff206114b6121a80e920d70cf043b90bf4a Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Mon, 17 Jul 2023 15:31:00 +0200
Subject: [PATCH] Try to build with gitk and git-gui
---
.gitlab-ci.yml | 2 ++
conanfile.py | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0543847..bfdf8cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,6 +25,8 @@ workflow:
- python --version | grep ${PYTHON_VERSION}
- python -m pip install --upgrade pip
- python -m pip install --upgrade conan
+ # Install prerequisite for git-gui and gitk
+ - sudo yum install tcl-devel tk-devel
# Build git with conan
- conan profile detect --force
- conan create . --version ${GIT_VERSION} -s compiler.libcxx=libstdc++11 --build="*"
diff --git a/conanfile.py b/conanfile.py
index da0d4f3..aad6a40 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -17,7 +17,6 @@ class GitRecipe(ConanFile):
build_requires = "libcurl/7.86.0"
_autotools_args = [
- "NO_TCLTK=YesPlease",
"NO_INSTALL_HARDLINKS=YesPlease",
"RUNTIME_PREFIX=YesPlease",
"gitexecdir=libexec/git-core",
@@ -39,7 +38,6 @@ class GitRecipe(ConanFile):
td.generate()
tc = AutotoolsToolchain(self)
tc.configure_args.append("--enable-pthreads=-pthread")
- tc.configure_args.append("--with-tcltk=NO")
tc.generate()
def build(self):
--
GitLab