{"thread":{"id":"63132","subject":"[PATCH 02/12] Makefile: only set some BASIC_CFLAGS when RUNTIME_PREFIX is set","startedAt":"2025-03-15T02:49:45Z","lastAt":"2025-03-15T02:49:45Z","messageCount":1,"participants":["Ramsay Jones"],"isPatch":true,"patchVersion":1,"patchTotal":12},"messages":[{"id":"514345","messageId":"ac4b7eda-1eba-4a6d-890f-49cbfb681da9@ramsayjones.plus.com","threadId":"63132","inReplyTo":null,"subject":"[PATCH 02/12] Makefile: only set some BASIC_CFLAGS when RUNTIME_PREFIX is set","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2025-03-15T02:46:42Z","receivedAt":"2025-03-15T02:49:45Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nSeveral build variables only have any meaning when the RUNTIME_PREFIX\nvariable has been set. In particular, the following build variables are\notherwise ignored:\n\n    HAVE_BSD_KERN_PROC_SYSCTL\n    PROCFS_EXECUTABLE_PATH\n    HAVE_NS_GET_EXECUTABLE_PATH\n    HAVE_ZOS_GET_EXECUTABLE_PATH\n    HAVE_WPGMPTR\n\nMake setting BASIC_CFLAGS, for each of these variables, conditional on\nthe RUNTIME_PREFIX being defined.\n\nSigned-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>\n---\n Makefile | 38 +++++++++++++++++++++-----------------\n 1 file changed, 21 insertions(+), 17 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 7315507381..818dde32a9 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -2179,10 +2179,6 @@ ifdef HAVE_BSD_SYSCTL\n \tBASIC_CFLAGS += -DHAVE_BSD_SYSCTL\n endif\n \n-ifdef HAVE_BSD_KERN_PROC_SYSCTL\n-\tBASIC_CFLAGS += -DHAVE_BSD_KERN_PROC_SYSCTL\n-endif\n-\n ifdef HAVE_GETDELIM\n \tBASIC_CFLAGS += -DHAVE_GETDELIM\n endif\n@@ -2213,25 +2209,33 @@ ifneq ($(findstring openssl,$(CSPRNG_METHOD)),)\n \tEXTLIBS += -lcrypto -lssl\n endif\n \n-ifneq ($(PROCFS_EXECUTABLE_PATH),)\n-\tprocfs_executable_path_SQ = $(subst ','\\'',$(PROCFS_EXECUTABLE_PATH))\n-\tBASIC_CFLAGS += '-DPROCFS_EXECUTABLE_PATH=\"$(procfs_executable_path_SQ)\"'\n-endif\n-\n ifndef HAVE_PLATFORM_PROCINFO\n \tCOMPAT_OBJS += compat/stub/procinfo.o\n endif\n \n-ifdef HAVE_NS_GET_EXECUTABLE_PATH\n-\tBASIC_CFLAGS += -DHAVE_NS_GET_EXECUTABLE_PATH\n-endif\n+ifdef RUNTIME_PREFIX\n \n-ifdef HAVE_ZOS_GET_EXECUTABLE_PATH\n-        BASIC_CFLAGS += -DHAVE_ZOS_GET_EXECUTABLE_PATH\n-endif\n+        ifdef HAVE_BSD_KERN_PROC_SYSCTL\n+\t\tBASIC_CFLAGS += -DHAVE_BSD_KERN_PROC_SYSCTL\n+        endif\n+\n+        ifneq ($(PROCFS_EXECUTABLE_PATH),)\n+\t\tpep_SQ = $(subst ','\\'',$(PROCFS_EXECUTABLE_PATH))\n+\t\tBASIC_CFLAGS += '-DPROCFS_EXECUTABLE_PATH=\"$(pep_SQ)\"'\n+        endif\n+\n+        ifdef HAVE_NS_GET_EXECUTABLE_PATH\n+\t\tBASIC_CFLAGS += -DHAVE_NS_GET_EXECUTABLE_PATH\n+        endif\n+\n+        ifdef HAVE_ZOS_GET_EXECUTABLE_PATH\n+\t\tBASIC_CFLAGS += -DHAVE_ZOS_GET_EXECUTABLE_PATH\n+        endif\n+\n+        ifdef HAVE_WPGMPTR\n+\t\tBASIC_CFLAGS += -DHAVE_WPGMPTR\n+        endif\n \n-ifdef HAVE_WPGMPTR\n-\tBASIC_CFLAGS += -DHAVE_WPGMPTR\n endif\n \n ifdef FILENO_IS_A_MACRO\n-- \n2.49.0\n"}]}