Skip to content

Commit f88957a

Browse files
committed
unix: track x11 dependency explicitly
We don't need x11 on macOS.
1 parent b5c0f27 commit f88957a

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

cpython-unix/Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ ifeq ($(PLATFORM),linux64)
2121
NEED_GCC := 1
2222
NEED_MUSL :=
2323
NEED_GDBM := 1
24+
NEED_X11 := 1
2425
NEED_READLINE := 1
2526
NEED_TIX := 1
2627
endif
@@ -30,6 +31,7 @@ ifeq ($(PLATFORM),macos)
3031
NEED_GCC :=
3132
NEED_MUSL :=
3233
NEED_GDBM :=
34+
NEED_X11 :=
3335
NEED_READLINE :=
3436
NEED_TIX :=
3537
endif
@@ -183,16 +185,17 @@ TIX_DEPENDS = \
183185
$(OUTDIR)/tcl-$(TCL_VERSION)-$(PLATFORM).tar \
184186
$(OUTDIR)/tcl-$(TCL_VERSION)-$(PLATFORM).tar \
185187
$(OUTDIR)/tk-$(TK_VERSION)-$(PLATFORM).tar \
186-
$(OUTDIR)/libX11-$(LIBX11_VERSION)-$(PLATFORM).tar \
188+
$(if $(NEED_X11),$(OUTDIR)/libX11-$(LIBX11_VERSION)-$(PLATFORM).tar) \
187189
$(OUTDIR)/xorgproto-$(XORGPROTO_VERSION)-$(PLATFORM).tar \
188190
$(NULL)
189191

190192
$(OUTDIR)/tix-$(TIX_VERSION)-$(PLATFORM).tar: $(TIX_DEPENDS)
191193
$(BUILD) --platform $(PLATFORM) tix
192194

193195
TK_DEPENDS = \
194-
$(HERE)/build-tk.sh $(OUTDIR)/tcl-$(TCL_VERSION)-$(PLATFORM).tar \
195-
$(OUTDIR)/libX11-$(LIBX11_VERSION)-$(PLATFORM).tar
196+
$(HERE)/build-tk.sh \
197+
$(OUTDIR)/tcl-$(TCL_VERSION)-$(PLATFORM).tar \
198+
$(if $(NEED_X11),$(OUTDIR)/libX11-$(LIBX11_VERSION)-$(PLATFORM).tar) \
196199
$(NULL)
197200

198201
$(OUTDIR)/tk-$(TK_VERSION)-$(PLATFORM).tar: $(TK_DEPENDS)

0 commit comments

Comments
 (0)