# [PATCH] Makefile: remove accidental recipe prefix in conditional 3 messages from 2025-02-13 to 2025-02-14. Participants: Taylor Blau, Junio C Hamano, Patrick Steinhardt. Thread: https://gitlist.dev/t/62950 ## Taylor Blau, 2025-02-13 20:25 Subject: [PATCH] Makefile: remove accidental recipe prefix in conditional Message-ID: URL: https://gitlist.dev/e/a79e9e9f50410721d85747b03559d55be98bca20.1739478347.git.me%40ttaylorr.com ``` Back in 728b9ac0c3 (Makefile(s): avoid recipe prefix in conditional statements, 2024-04-08), we prepared our Makefiles for a forthcoming change in upstream Make that would ban the recipe prefix within a conditional statement by replacing tabs (the prefix) with eight spaces. In b9d6f64393 (compat/zlib: allow use of zlib-ng as backend, 2025-01-28), a handful of recipe prefix characters were introduced in a conditional statement ('ifdef ZLIB_NG'), causing 'make' to fail on my system, which uses GNU Make 4.4.90. Remove the recipe prefix characters by replacing them with the same script as is mentioned in 728b9ac0c3. Signed-off-by: Taylor Blau --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 90c9662ad3..5b98a9d12f 100644 --- a/Makefile +++ b/Makefile @@ -1703,16 +1703,16 @@ IMAP_SEND_LDFLAGS += $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO) ifdef ZLIB_NG BASIC_CFLAGS += -DHAVE_ZLIB_NG - ifdef ZLIB_NG_PATH + ifdef ZLIB_NG_PATH BASIC_CFLAGS += -I$(ZLIB_NG_PATH)/include EXTLIBS += $(call libpath_template,$(ZLIB_NG_PATH)/$(lib)) - endif + endif EXTLIBS += -lz-ng else - ifdef ZLIB_PATH + ifdef ZLIB_PATH BASIC_CFLAGS += -I$(ZLIB_PATH)/include EXTLIBS += $(call libpath_template,$(ZLIB_PATH)/$(lib)) - endif + endif EXTLIBS += -lz endif base-commit: e2067b49ecaef9b7f51a17ce251f9207f72ef52d -- 2.48.0.25.g629188ede7e ``` ## Junio C Hamano, 2025-02-13 21:17 Subject: Re: [PATCH] Makefile: remove accidental recipe prefix in conditional Message-ID: URL: https://gitlist.dev/e/xmqq1pw1o87k.fsf%40gitster.g In-Reply-To: ``` Taylor Blau writes: > Back in 728b9ac0c3 (Makefile(s): avoid recipe prefix in conditional > statements, 2024-04-08), we prepared our Makefiles for a forthcoming > change in upstream Make that would ban the recipe prefix within a > conditional statement by replacing tabs (the prefix) with eight spaces. > > In b9d6f64393 (compat/zlib: allow use of zlib-ng as backend, > 2025-01-28), a handful of recipe prefix characters were introduced in a > conditional statement ('ifdef ZLIB_NG'), causing 'make' to fail on my > system, which uses GNU Make 4.4.90. Yikes. Thanks for fixing it so quickly. > Remove the recipe prefix characters by replacing them with the same > script as is mentioned in 728b9ac0c3. > > Signed-off-by: Taylor Blau > --- > Makefile | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Makefile b/Makefile > index 90c9662ad3..5b98a9d12f 100644 > --- a/Makefile > +++ b/Makefile > @@ -1703,16 +1703,16 @@ IMAP_SEND_LDFLAGS += $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO) > > ifdef ZLIB_NG > BASIC_CFLAGS += -DHAVE_ZLIB_NG > - ifdef ZLIB_NG_PATH > + ifdef ZLIB_NG_PATH > BASIC_CFLAGS += -I$(ZLIB_NG_PATH)/include > EXTLIBS += $(call libpath_template,$(ZLIB_NG_PATH)/$(lib)) > - endif > + endif > EXTLIBS += -lz-ng > else > - ifdef ZLIB_PATH > + ifdef ZLIB_PATH > BASIC_CFLAGS += -I$(ZLIB_PATH)/include > EXTLIBS += $(call libpath_template,$(ZLIB_PATH)/$(lib)) > - endif > + endif > EXTLIBS += -lz > endif > > > base-commit: e2067b49ecaef9b7f51a17ce251f9207f72ef52d ``` ## Patrick Steinhardt, 2025-02-14 04:55 Subject: Re: [PATCH] Makefile: remove accidental recipe prefix in conditional Message-ID: URL: https://gitlist.dev/e/Z67M2rZ082v5j9SH%40pks.im In-Reply-To: ``` On Thu, Feb 13, 2025 at 03:25:50PM -0500, Taylor Blau wrote: > Back in 728b9ac0c3 (Makefile(s): avoid recipe prefix in conditional > statements, 2024-04-08), we prepared our Makefiles for a forthcoming > change in upstream Make that would ban the recipe prefix within a > conditional statement by replacing tabs (the prefix) with eight spaces. > > In b9d6f64393 (compat/zlib: allow use of zlib-ng as backend, > 2025-01-28), a handful of recipe prefix characters were introduced in a > conditional statement ('ifdef ZLIB_NG'), causing 'make' to fail on my > system, which uses GNU Make 4.4.90. > > Remove the recipe prefix characters by replacing them with the same > script as is mentioned in 728b9ac0c3. Oh, that's a change I wasn't aware of in Make. The patch looks obviously good to me in that context, thanks for fixing! Patrick ```