From: Aurelien DARRAGON Date: Thu, 5 Jun 2025 11:07:42 +0000 (+0200) Subject: BUILD: restore USE_SHM_OPEN build option X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7656a417843d9f54925d987a2666d11081aab956;p=thirdparty%2Fhaproxy.git BUILD: restore USE_SHM_OPEN build option Some optional features may still require the use of shm_open() in the future. In this patch we restore the USE_SHM_OPEN build option that was removed in 143be1b59 ("MEDIUM: errors: get rid of shm_open()") and should guard the use of shm_open() in the code. --- diff --git a/Makefile b/Makefile index b874fa32f..fca129c0b 100644 --- a/Makefile +++ b/Makefile @@ -62,6 +62,7 @@ # USE_MEMORY_PROFILING : enable the memory profiler. Linux-glibc only. # USE_LIBATOMIC : force to link with/without libatomic. Automatic. # USE_PTHREAD_EMULATION : replace pthread's rwlocks with ours +# USE_SHM_OPEN : use shm_open() for features that can make use of shared memory # # Options can be forced by specifying "USE_xxx=1" or can be disabled by using # "USE_xxx=" (empty string). The list of enabled and disabled options for a @@ -343,7 +344,7 @@ use_opts = USE_EPOLL USE_KQUEUE USE_NETFILTER USE_POLL \ USE_MATH USE_DEVICEATLAS USE_51DEGREES \ USE_WURFL USE_OBSOLETE_LINKER USE_PRCTL USE_PROCCTL \ USE_THREAD_DUMP USE_EVPORTS USE_OT USE_QUIC USE_PROMEX \ - USE_MEMORY_PROFILING \ + USE_MEMORY_PROFILING USE_SHM_OPEN \ USE_STATIC_PCRE USE_STATIC_PCRE2 \ USE_PCRE USE_PCRE_JIT USE_PCRE2 USE_PCRE2_JIT USE_QUIC_OPENSSL_COMPAT @@ -382,7 +383,7 @@ ifeq ($(TARGET),linux-glibc) USE_POLL USE_TPROXY USE_LIBCRYPT USE_DL USE_RT USE_CRYPT_H USE_NETFILTER \ USE_CPU_AFFINITY USE_THREAD USE_EPOLL USE_LINUX_TPROXY USE_LINUX_CAP \ USE_ACCEPT4 USE_LINUX_SPLICE USE_PRCTL USE_THREAD_DUMP USE_NS USE_TFO \ - USE_GETADDRINFO USE_BACKTRACE) + USE_GETADDRINFO USE_BACKTRACE USE_SHM_OPEN) INSTALL = install -v endif @@ -401,7 +402,7 @@ ifeq ($(TARGET),linux-musl) USE_POLL USE_TPROXY USE_LIBCRYPT USE_DL USE_RT USE_CRYPT_H USE_NETFILTER \ USE_CPU_AFFINITY USE_THREAD USE_EPOLL USE_LINUX_TPROXY USE_LINUX_CAP \ USE_ACCEPT4 USE_LINUX_SPLICE USE_PRCTL USE_THREAD_DUMP USE_NS USE_TFO \ - USE_GETADDRINFO USE_BACKTRACE) + USE_GETADDRINFO USE_BACKTRACE USE_SHM_OPEN) INSTALL = install -v endif