diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0543847a5edb059207737b0f3c5c38687ceb1525..bfdf8cd4791610bd012d55913ec91f8251c82483 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 da0d4f3c744d05fbeeb5a7a87420ced042e0dd63..aad6a4044596cc87276f3506da19551f9fc23c33 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):