Skip to content
Snippets Groups Projects
Commit 654a9ff2 authored by MADELA Patrick's avatar MADELA Patrick
Browse files

Try to build with gitk and git-gui

parent 50f40bbc
No related branches found
No related tags found
No related merge requests found
...@@ -25,6 +25,8 @@ workflow: ...@@ -25,6 +25,8 @@ workflow:
- python --version | grep ${PYTHON_VERSION} - python --version | grep ${PYTHON_VERSION}
- python -m pip install --upgrade pip - python -m pip install --upgrade pip
- python -m pip install --upgrade conan - python -m pip install --upgrade conan
# Install prerequisite for git-gui and gitk
- sudo yum install tcl-devel tk-devel
# Build git with conan # Build git with conan
- conan profile detect --force - conan profile detect --force
- conan create . --version ${GIT_VERSION} -s compiler.libcxx=libstdc++11 --build="*" - conan create . --version ${GIT_VERSION} -s compiler.libcxx=libstdc++11 --build="*"
......
...@@ -17,7 +17,6 @@ class GitRecipe(ConanFile): ...@@ -17,7 +17,6 @@ class GitRecipe(ConanFile):
build_requires = "libcurl/7.86.0" build_requires = "libcurl/7.86.0"
_autotools_args = [ _autotools_args = [
"NO_TCLTK=YesPlease",
"NO_INSTALL_HARDLINKS=YesPlease", "NO_INSTALL_HARDLINKS=YesPlease",
"RUNTIME_PREFIX=YesPlease", "RUNTIME_PREFIX=YesPlease",
"gitexecdir=libexec/git-core", "gitexecdir=libexec/git-core",
...@@ -39,7 +38,6 @@ class GitRecipe(ConanFile): ...@@ -39,7 +38,6 @@ class GitRecipe(ConanFile):
td.generate() td.generate()
tc = AutotoolsToolchain(self) tc = AutotoolsToolchain(self)
tc.configure_args.append("--enable-pthreads=-pthread") tc.configure_args.append("--enable-pthreads=-pthread")
tc.configure_args.append("--with-tcltk=NO")
tc.generate() tc.generate()
def build(self): def build(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment