From e92989b07a9ff8ae67400fa1d550a6ceed92f2e0 Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Sun, 29 Jun 2025 22:39:14 +0200 Subject: [PATCH] patch 9.1.1497: Link error with shm_open() Problem: Link error with shm_open() (gcanat, after v9.1.1485) Solution: use AC_LINK_IFELSE instead of AC_COMPILE_IFELSE fixes: #17634 Signed-off-by: Christian Brabandt --- src/auto/configure | 5 +++-- src/configure.ac | 2 +- src/version.c | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/auto/configure b/src/auto/configure index df3d84b8a3..b72d4edca5 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -9080,7 +9080,7 @@ shm_open("/test", O_CREAT, 0600); return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" +if ac_fn_c_try_link "$LINENO" then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SHM_OPEN 1" >>confdefs.h @@ -9090,7 +9090,8 @@ else case e in #( printf "%s\n" "no" >&6; } ;; esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext CPPFLAGS=$cppflags_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-wayland argument" >&5 diff --git a/src/configure.ac b/src/configure.ac index 7738433e8f..62f6bbb708 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -2392,7 +2392,7 @@ dnl defining FEAT_XFONTSET is delayed, so that it can be disabled for no GUI AC_MSG_CHECKING(if shm_open is available) cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" -AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +AC_LINK_IFELSE([AC_LANG_PROGRAM( [#include #include #include ], [shm_open("/test", O_CREAT, 0600);])], diff --git a/src/version.c b/src/version.c index 2cf34ea333..7b13da4dab 100644 --- a/src/version.c +++ b/src/version.c @@ -719,6 +719,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1497, /**/ 1496, /**/