git-2.29.1: failed to build in trace

[iefdev (Eric F)]

Git failed to build in trace mode: port -t upgrade.

I assume it's because Wish is hidden.

Line
1864	:info:build /usr/bin/make -C git-gui  gitexecdir='/opt/local/libexec/git-core' all
1865	:info:build make[1]: Entering directory `/opt/local/var/macports/build/_opt_local_var_macports_sources_github.com_macports_macports-ports_devel_git/git/work/git-2.29.1/git-gui'
1866	:info:build GITGUI_VERSION = 0.21.0.78.g38c2a
1867	:info:build make[1]: Leaving directory `/opt/local/var/macports/build/_opt_local_var_macports_sources_github.com_macports_macports-ports_devel_git/git/work/git-2.29.1/git-gui'
1868	:info:build make[1]: Entering directory `/opt/local/var/macports/build/_opt_local_var_macports_sources_github.com_macports_macports-ports_devel_git/git/work/git-2.29.1/git-gui'
1869	:info:build     * new locations or Tcl/Tk interpreter
1870	:info:build make[1]: *** No rule to make target `/Library/Frameworks/Tk.framework/Resources/Wish.app/Contents/MacOS/Wish', needed by `Git Gui.app'.  Stop.
1871	:info:build make[1]: *** Waiting for unfinished jobs....
1872	:info:build make[1]: Leaving directory `/opt/local/var/macports/build/_opt_local_var_macports_sources_github.com_macports_macports-ports_devel_git/git/work/git-2.29.1/git-gui'
1873	:info:build make: *** [all] Error 2
1874	:info:build make: Leaving directory `/opt/local/var/macports/build/_opt_local_var_macports_sources_github.com_macports_macports-ports_devel_git/git/work/git-2.29.1'
1875	:info:build Command failed:  cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_github.com_macports_macports-ports_devel_git/git/work/git-2.29.1" && /usr/bin/make -j5 -w all CFLAGS="-I. -Wall -O2 -I/opt/local/include -arch x86_64" LDFLAGS="-L/opt/local/lib -arch x86_64" CC=/usr/bin/clang prefix=/opt/local CURLDIR=/opt/local OPENSSLDIR=/opt/local ICONVDIR=/opt/local PERL_PATH="/opt/local/bin/perl5.30" PYTHON_PATH="/opt/local/bin/python3.8" NO_FINK=1 NO_DARWIN_PORTS=1 NO_R_TO_GCC_LINKER=1 NO_PERL_CPAN_FALLBACK=1 V=1 LIBPCREDIR=/opt/local USE_LIBPCRE2=1
1876	:info:build Exit code: 2
1877	:warn:build The following existing files were hidden from the build system by trace mode:
1878	:msg:build   /Library/Frameworks/Tk.framework/Resources/Wish.app/Contents/MacOS/Wish
1879	:msg:build   /opt/local/bin/ar
1880	:msg:build   /opt/local/bin/ggrep
1881	:msg:build   /opt/local/bin/git
1882	:msg:build   /opt/local/bin/gsed

A normal port upgrade worked fine though.

[jmroot (Joshua Root)]

Presumably this only happens if you have Tk installed in /Library/Frameworks. Still shouldn't happen of course.

[iefdev (Eric F)]

In git-2.29.1/git-gui/Makefile, there is this block:

Line
99	TCLTK_PATH ?= wish
100	ifeq (./,$(dir $(TCLTK_PATH)))
101	TCL_PATH ?= $(subst wish,tclsh,$(TCLTK_PATH))
102	else
103	TCL_PATH ?= $(dir $(TCLTK_PATH))$(notdir $(subst wish,tclsh,$(TCLTK_PATH)))
104	endif
105
106	ifeq ($(uname_S),Darwin)
107	TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app
108	ifeq ($(shell echo "$(uname_R)" | awk -F. '{if ($$1 >= 9) print "y"}')_$(shell test -d $(TKFRAMEWORK) || echo n),y_n)
109	TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish.app
110	ifeq ($(shell test -d $(TKFRAMEWORK) || echo n),n)
111	TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish\ Shell.app
112	endif
113	endif
114	TKEXECUTABLE = $(shell basename "$(TKFRAMEWORK)" .app)
115	endif

Perhaps TKFRAMEWORK &/or TCL_PATH is something that could be passed through build.args?

[iefdev (Eric F)]

Made a PR for this here: ​https://github.com/macports/macports-ports/pull/8979

…incl fixing a couple of patches with fuzz and offsets

[iefdev (Eric F)]

In 1d3b58652a3289810dc43cdc3ea2a2fe48a10942/macports-ports (master):

git: fix trace build, patch fuzz and offsets

• add patch-git-gui-Makefile.diff
• fix patch offsets and fuzz
• Closes: #61381