{"thread":{"id":"62950","subject":"[PATCH] Makefile: remove accidental recipe prefix in conditional","startedAt":"2025-02-13T20:25:53Z","lastAt":"2025-02-14T04:55:58Z","messageCount":3,"participants":["Taylor Blau","Junio C Hamano","Patrick Steinhardt"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"512382","messageId":"a79e9e9f50410721d85747b03559d55be98bca20.1739478347.git.me@ttaylorr.com","threadId":"62950","inReplyTo":null,"subject":"[PATCH] Makefile: remove accidental recipe prefix in conditional","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2025-02-13T20:25:50Z","receivedAt":"2025-02-13T20:25:53Z","isPatch":true,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"Back in 728b9ac0c3 (Makefile(s): avoid recipe prefix in conditional\nstatements, 2024-04-08), we prepared our Makefiles for a forthcoming\nchange in upstream Make that would ban the recipe prefix within a\nconditional statement by replacing tabs (the prefix) with eight spaces.\n\nIn b9d6f64393 (compat/zlib: allow use of zlib-ng as backend,\n2025-01-28), a handful of recipe prefix characters were introduced in a\nconditional statement ('ifdef ZLIB_NG'), causing 'make' to fail on my\nsystem, which uses GNU Make 4.4.90.\n\nRemove the recipe prefix characters by replacing them with the same\nscript as is mentioned in 728b9ac0c3.\n\nSigned-off-by: Taylor Blau <me@ttaylorr.com>\n---\n Makefile | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 90c9662ad3..5b98a9d12f 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1703,16 +1703,16 @@ IMAP_SEND_LDFLAGS += $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO)\n \n ifdef ZLIB_NG\n \tBASIC_CFLAGS += -DHAVE_ZLIB_NG\n-\tifdef ZLIB_NG_PATH\n+        ifdef ZLIB_NG_PATH\n \t\tBASIC_CFLAGS += -I$(ZLIB_NG_PATH)/include\n \t\tEXTLIBS += $(call libpath_template,$(ZLIB_NG_PATH)/$(lib))\n-\tendif\n+        endif\n \tEXTLIBS += -lz-ng\n else\n-\tifdef ZLIB_PATH\n+        ifdef ZLIB_PATH\n \t\tBASIC_CFLAGS += -I$(ZLIB_PATH)/include\n \t\tEXTLIBS += $(call libpath_template,$(ZLIB_PATH)/$(lib))\n-\tendif\n+        endif\n \tEXTLIBS += -lz\n endif\n \n\nbase-commit: e2067b49ecaef9b7f51a17ce251f9207f72ef52d\n-- \n2.48.0.25.g629188ede7e\n"},{"id":"512385","messageId":"xmqq1pw1o87k.fsf@gitster.g","threadId":"62950","inReplyTo":"a79e9e9f50410721d85747b03559d55be98bca20.1739478347.git.me@ttaylorr.com","subject":"Re: [PATCH] Makefile: remove accidental recipe prefix in conditional","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-02-13T21:17:35Z","receivedAt":"2025-02-13T21:17:38Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Taylor Blau <me@ttaylorr.com> writes:\n\n> Back in 728b9ac0c3 (Makefile(s): avoid recipe prefix in conditional\n> statements, 2024-04-08), we prepared our Makefiles for a forthcoming\n> change in upstream Make that would ban the recipe prefix within a\n> conditional statement by replacing tabs (the prefix) with eight spaces.\n>\n> In b9d6f64393 (compat/zlib: allow use of zlib-ng as backend,\n> 2025-01-28), a handful of recipe prefix characters were introduced in a\n> conditional statement ('ifdef ZLIB_NG'), causing 'make' to fail on my\n> system, which uses GNU Make 4.4.90.\n\nYikes.  Thanks for fixing it so quickly.\n\n> Remove the recipe prefix characters by replacing them with the same\n> script as is mentioned in 728b9ac0c3.\n>\n> Signed-off-by: Taylor Blau <me@ttaylorr.com>\n> ---\n>  Makefile | 8 ++++----\n>  1 file changed, 4 insertions(+), 4 deletions(-)\n>\n> diff --git a/Makefile b/Makefile\n> index 90c9662ad3..5b98a9d12f 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -1703,16 +1703,16 @@ IMAP_SEND_LDFLAGS += $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO)\n>  \n>  ifdef ZLIB_NG\n>  \tBASIC_CFLAGS += -DHAVE_ZLIB_NG\n> -\tifdef ZLIB_NG_PATH\n> +        ifdef ZLIB_NG_PATH\n>  \t\tBASIC_CFLAGS += -I$(ZLIB_NG_PATH)/include\n>  \t\tEXTLIBS += $(call libpath_template,$(ZLIB_NG_PATH)/$(lib))\n> -\tendif\n> +        endif\n>  \tEXTLIBS += -lz-ng\n>  else\n> -\tifdef ZLIB_PATH\n> +        ifdef ZLIB_PATH\n>  \t\tBASIC_CFLAGS += -I$(ZLIB_PATH)/include\n>  \t\tEXTLIBS += $(call libpath_template,$(ZLIB_PATH)/$(lib))\n> -\tendif\n> +        endif\n>  \tEXTLIBS += -lz\n>  endif\n>  \n>\n> base-commit: e2067b49ecaef9b7f51a17ce251f9207f72ef52d\n"},{"id":"512403","messageId":"Z67M2rZ082v5j9SH@pks.im","threadId":"62950","inReplyTo":"a79e9e9f50410721d85747b03559d55be98bca20.1739478347.git.me@ttaylorr.com","subject":"Re: [PATCH] Makefile: remove accidental recipe prefix in conditional","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2025-02-14T04:55:54Z","receivedAt":"2025-02-14T04:55:58Z","isPatch":true,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"On Thu, Feb 13, 2025 at 03:25:50PM -0500, Taylor Blau wrote:\n> Back in 728b9ac0c3 (Makefile(s): avoid recipe prefix in conditional\n> statements, 2024-04-08), we prepared our Makefiles for a forthcoming\n> change in upstream Make that would ban the recipe prefix within a\n> conditional statement by replacing tabs (the prefix) with eight spaces.\n> \n> In b9d6f64393 (compat/zlib: allow use of zlib-ng as backend,\n> 2025-01-28), a handful of recipe prefix characters were introduced in a\n> conditional statement ('ifdef ZLIB_NG'), causing 'make' to fail on my\n> system, which uses GNU Make 4.4.90.\n> \n> Remove the recipe prefix characters by replacing them with the same\n> script as is mentioned in 728b9ac0c3.\n\nOh, that's a change I wasn't aware of in Make. The patch looks obviously\ngood to me in that context, thanks for fixing!\n\nPatrick\n"}]}