threads / patch / 64633

patch, 3 partsMakefile: Make all darwin into config.mak.uname

Subject: [PATCH v0 2/3] Makefile: Make all darwin into config.mak.uname

## tl;dr

2 messages between Dec 15, 2025 and Dec 16, 2025. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

tboegi@web.de· Dec 15, 2025, 20:45 UTC · lore
From: Torsten Bögershausen <tboegi@web.de>

Move all the Darwin stuff from Makefile into config.mak.uname, we need it there in the next commit.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
---
 Makefile         | 21 ---------------------
 config.mak.uname | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 21 deletions(-)
Show changes to 2 files +18 −21

Makefile, config.mak.uname

diff --git a/Makefile b/Makefile
index 6de036e4e2..2d666c26e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1672,27 +1672,6 @@ ifneq (,$(SOCKLEN_T))
 	BASIC_CFLAGS += -Dsocklen_t=$(SOCKLEN_T)
 endif
 
-ifeq ($(uname_S),Darwin)
-        ifndef NO_FINK
-                ifeq ($(shell test -d /sw/lib && echo y),y)
-			BASIC_CFLAGS += -I/sw/include
-			BASIC_LDFLAGS += -L/sw/lib
-                endif
-        endif
-        ifndef NO_DARWIN_PORTS
-                ifeq ($(shell test -d /opt/local/lib && echo y),y)
-			BASIC_CFLAGS += -I/opt/local/include
-			BASIC_LDFLAGS += -L/opt/local/lib
-                endif
-        endif
-        ifndef NO_APPLE_COMMON_CRYPTO
-		NO_OPENSSL = YesPlease
-		APPLE_COMMON_CRYPTO = YesPlease
-		COMPAT_CFLAGS += -DAPPLE_COMMON_CRYPTO
-        endif
-	PTHREAD_LIBS =
-endif
-
 ifndef NO_HOMEBREW
 	ifdef HOMEBREW_PREFIX
 		BASIC_CFLAGS += -I$(HOMEBREW_PREFIX)/include
diff --git a/config.mak.uname b/config.mak.uname
index a926943141..44252dabcc 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -189,6 +189,24 @@ ifeq ($(uname_S),Darwin)
         endif
 
 	BASIC_LDFLAGS += -framework CoreServices
+	ifndef NO_FINK
+		ifeq ($(shell test -d /sw/lib && echo y),y)
+			BASIC_CFLAGS += -I/sw/include
+			BASIC_LDFLAGS += -L/sw/lib
+		endif
+	endif
+	ifndef NO_DARWIN_PORTS
+		ifeq ($(shell test -d /opt/local/lib && echo y),y)
+			BASIC_CFLAGS += -I/opt/local/include
+			BASIC_LDFLAGS += -L/opt/local/lib
+		endif
+	endif
+	ifndef NO_APPLE_COMMON_CRYPTO
+		NO_OPENSSL = YesPlease
+		APPLE_COMMON_CRYPTO = YesPlease
+		COMPAT_CFLAGS += -DAPPLE_COMMON_CRYPTO
+	endif
+	PTHREAD_LIBS =
 endif
 ifeq ($(uname_S),SunOS)
 	NEEDS_SOCKET = YesPlease
-- 
2.50.0.rc0.46.g7014b55638.dirty
René Scharfe· Dec 16, 2025, 18:53 UTC · re: tboegi@web.de · lore

Re: [PATCH v0 2/3] Makefile: Make all darwin into config.mak.uname

On 12/15/25 9:45 PM, tboegi@web.de wrote:
Show 72 quoted lines
> From: Torsten Bögershausen <tboegi@web.de>
> 
> Move all the Darwin stuff from Makefile into config.mak.uname,
> we need it there in the next commit.
> 
> Signed-off-by: Torsten Bögershausen <tboegi@web.de>
> ---
>  Makefile         | 21 ---------------------
>  config.mak.uname | 18 ++++++++++++++++++
>  2 files changed, 18 insertions(+), 21 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 6de036e4e2..2d666c26e4 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1672,27 +1672,6 @@ ifneq (,$(SOCKLEN_T))
>  	BASIC_CFLAGS += -Dsocklen_t=$(SOCKLEN_T)
>  endif
>  
> -ifeq ($(uname_S),Darwin)
> -        ifndef NO_FINK
> -                ifeq ($(shell test -d /sw/lib && echo y),y)
> -			BASIC_CFLAGS += -I/sw/include
> -			BASIC_LDFLAGS += -L/sw/lib
> -                endif
> -        endif
> -        ifndef NO_DARWIN_PORTS
> -                ifeq ($(shell test -d /opt/local/lib && echo y),y)
> -			BASIC_CFLAGS += -I/opt/local/include
> -			BASIC_LDFLAGS += -L/opt/local/lib
> -                endif
> -        endif
> -        ifndef NO_APPLE_COMMON_CRYPTO
> -		NO_OPENSSL = YesPlease
> -		APPLE_COMMON_CRYPTO = YesPlease
> -		COMPAT_CFLAGS += -DAPPLE_COMMON_CRYPTO
> -        endif
> -	PTHREAD_LIBS =
> -endif
> -
>  ifndef NO_HOMEBREW
>  	ifdef HOMEBREW_PREFIX
>  		BASIC_CFLAGS += -I$(HOMEBREW_PREFIX)/include
> diff --git a/config.mak.uname b/config.mak.uname
> index a926943141..44252dabcc 100644
> --- a/config.mak.uname
> +++ b/config.mak.uname
> @@ -189,6 +189,24 @@ ifeq ($(uname_S),Darwin)
>          endif
>  
>  	BASIC_LDFLAGS += -framework CoreServices
> +	ifndef NO_FINK
> +		ifeq ($(shell test -d /sw/lib && echo y),y)
> +			BASIC_CFLAGS += -I/sw/include
> +			BASIC_LDFLAGS += -L/sw/lib
> +		endif
> +	endif
> +	ifndef NO_DARWIN_PORTS
> +		ifeq ($(shell test -d /opt/local/lib && echo y),y)
> +			BASIC_CFLAGS += -I/opt/local/include
> +			BASIC_LDFLAGS += -L/opt/local/lib
> +		endif
> +	endif
> +	ifndef NO_APPLE_COMMON_CRYPTO
> +		NO_OPENSSL = YesPlease
> +		APPLE_COMMON_CRYPTO = YesPlease
> +		COMPAT_CFLAGS += -DAPPLE_COMMON_CRYPTO
> +	endif
> +	PTHREAD_LIBS =
>  endif
>  ifeq ($(uname_S),SunOS)
>  	NEEDS_SOCKET = YesPlease

This works if you set these variables on the make command line, but it won't work when setting them in config.mak, which is the main place for custom make variables. That's because it's included last in Makefile:

include config.mak.uname -include config.mak.autogen -include config.mak

René

← back to recent threads