patch apr

netty · Feb 28, 2024 · dbf2691 · dbf2691
1 parent 6c2fea2
commit dbf2691
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/patches/apr_siglist.patch b/patches/apr_siglist.patch
@@ -0,0 +1,10 @@
+--- configure.in.old	2024-02-27 20:42:12
++++ configure.in	2024-02-27 20:46:44
+@@ -1600,7 +1600,6 @@
+ AC_SUBST(sendfile)
+
+ AC_CHECK_FUNCS(sigaction, [ have_sigaction="1" ], [ have_sigaction="0" ])
+-AC_DECL_SYS_SIGLIST
+
+ AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ])
+ AC_SUBST(apr_inaddr_none)
diff --git a/pom.xml b/pom.xml
@@ -663,6 +663,10 @@
                         <mkdir dir="${aprHome}" />
                         <echo message="Patching APR to not link against libcrypt" />
                         <patch patchfile="../patches/apr_crypt.patch" strip="0" dir="${aprSourceDir}" />
+
+                        <echo message="Patching APR to not link against sys_siglist" />
+                        <patch patchfile="../patches/apr_siglist.patch" strip="0" dir="${aprSourceDir}" />
+
                         <exec executable="buildconf" failonerror="true" dir="${aprSourceDir}" resolveexecutable="true" />
 
                         <if>
@@ -696,7 +700,7 @@
                                 Disable the detection of sys_siglist and just use apr's own implementation to workaround problems when trying to use static jars on alpine linux
                                 See https://github.com/netty/netty-tcnative/issues/853
                               -->
-                              <arg line="--disable-shared --prefix=${aprHome} CFLAGS='-O3 -fno-omit-frame-pointer -fPIC' ac_cv_have_decl_sys_siglist=no HAVE_DECL_SYS_SIGLIST=0 ${macOsxDeploymentTarget}" />
+                              <arg line="--disable-shared --prefix=${aprHome} CFLAGS='-O3 -fno-omit-frame-pointer -fPIC' ${macOsxDeploymentTarget}" />
                             </exec>
                             <exec executable="make" failonerror="true" dir="${aprSourceDir}" resolveexecutable="true" />
                             <exec executable="make" failonerror="true" dir="${aprSourceDir}" resolveexecutable="true">