-
Notifications
You must be signed in to change notification settings - Fork 38
/
neon27.patch
66 lines (61 loc) · 2.47 KB
/
neon27.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
diff -ruN neon-0.32.1-orig/configure.ac neon-0.32.1/configure.ac
--- neon-0.32.1-orig/configure.ac 2021-09-20 14:17:44.000000000 -0500
+++ neon-0.32.1/configure.ac 2021-09-23 06:23:08.000000000 -0500
@@ -79,14 +79,14 @@
# Leave till last to prevent CFLAGS affecting checks.
NEON_WARNINGS
-CPPFLAGS="$CPPFLAGS -I\${top_builddir}"
+CPPFLAGS="-I\${top_builddir} $CPPFLAGS"
AC_ARG_ENABLE(memleak,
AS_HELP_STRING([--enable-memleak],
[for test builds only: enable memory leak checking]))
if test "$enable_memleak" = "yes"; then
- CPPFLAGS="$CPPFLAGS -DNEON_MEMLEAK -I\$(top_srcdir)/src"
+ CPPFLAGS="-DNEON_MEMLEAK -I\$(top_srcdir)/src $CPPFLAGS"
# disable 'make install'
ALLOW_INSTALL=memleak
fi
diff -ruN neon-0.32.1-orig/macros/neon.m4 neon-0.32.1/macros/neon.m4
--- neon-0.32.1-orig/macros/neon.m4 2021-09-20 15:17:44.000000000 -0400
+++ neon-0.32.1/macros/neon.m4 2021-09-30 03:57:28.000000000 -0400
@@ -376,6 +376,10 @@
ne__prologue="#include <sys/socket.h>"
ne__code="socket(0,0,0);"
;;
+ bindtextdomain)
+ ne__prologue="#include <libintl.h>"
+ ne__code="bindtextdomain(\"\",\"\");"
+ ;;
*)
ne__prologue=""
ne__code="$1();"
@@ -460,7 +464,7 @@
if test "$ne_cv_os_uname" = "Darwin"; then
CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
- LDFLAGS="$LDFLAGS -flat_namespace"
+ LDFLAGS="$LDFLAGS"
# poll has various issues in various Darwin releases
if test x${ac_cv_func_poll+set} != xset; then
ac_cv_func_poll=no
@@ -1113,8 +1117,8 @@
KRB5_CONF_TOOL=pkgconf],
[AC_PATH_PROG([KRB5_CONF_TOOL], krb5-config, none, $PATH:/usr/kerberos/bin)
if test "x$KRB5_CONF_TOOL" != "xnone"; then
- NE_GSSAPI_LIBS="`${KRB5_CONF_TOOL} --libs gssapi`"
- NE_GSSAPI_CFLAGS="`${KRB5_CONF_TOOL} --cflags gssapi`"
+ NE_GSSAPI_LIBS="`${KRB5_CONF_TOOL} --libs krb5`"
+ NE_GSSAPI_CFLAGS="`${KRB5_CONF_TOOL} --cflags krb5`"
NE_GSSAPI_VERSION="`${KRB5_CONF_TOOL} --version`"
fi])
else
diff -ruN neon-0.32.1-orig/test/Makefile.in neon-0.32.1/test/Makefile.in
--- neon-0.32.1-orig/test/Makefile.in 2021-09-20 14:17:44.000000000 -0500
+++ neon-0.32.1/test/Makefile.in 2021-09-23 06:25:01.000000000 -0500
@@ -1,7 +1,7 @@
# Makefile for neon test suite.
SHELL = @SHELL@
-CPPFLAGS = @CPPFLAGS@ -I. -I$(top_srcdir)/src -I$(top_srcdir)/test/common
+CPPFLAGS = -I. -I$(top_srcdir)/src -I$(top_srcdir)/test/common @CPPFLAGS@
CFLAGS = @CFLAGS@ @NEON_CFLAGS@
LDFLAGS = @LDFLAGS@
DEFS = @DEFS@