Thread (2 messages) 2 messages, 2 authors, 2025-02-14
STALE517d

[PATCH] Makefile: remove accidental recipe prefix in conditional

From: Taylor Blau <hidden>
Date: 2025-02-13 20:25:53
Subsystem: kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers: Nathan Chancellor, Nicolas Schier, Linus Torvalds

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 <redacted>
---
 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help