blob: 22002fadca4eabb03e13c8325bdb22d7f48288e4 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From caa19231196d73541445728e6813c8fa70345acb Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 26 Jun 2018 15:59:00 +0800
4Subject: [PATCH] nfs-utils: 2.1.1 -> 2.3.1
5
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08006Fixed:
7configure: error: res_querydomain needed
8
Brad Bishop19323692019-04-05 15:28:33 -04009Upstream-Status: Pending [https://github.com/alpinelinux/aports/blob/master/main/nfs-utils/musl-configure_ac.patch]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080010
11Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Brad Bishop19323692019-04-05 15:28:33 -040012
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080013---
Brad Bishop19323692019-04-05 15:28:33 -040014 configure.ac | 13 ++++++-------
15 1 file changed, 6 insertions(+), 7 deletions(-)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080016
17diff --git a/configure.ac b/configure.ac
Brad Bishop19323692019-04-05 15:28:33 -040018index 276dec3..760238b 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080019--- a/configure.ac
20+++ b/configure.ac
Brad Bishop19323692019-04-05 15:28:33 -040021@@ -408,7 +408,7 @@ if test "$enable_gss" = yes; then
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080022 fi
23
24 dnl libdnsidmap specific checks
25-AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
26+AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
27
28 AC_ARG_ENABLE([ldap],
29 [AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])])
Brad Bishop19323692019-04-05 15:28:33 -040030@@ -547,11 +547,11 @@ my_am_cflags="\
31 -pipe \
32 -Wall \
33 -Wextra \
34- -Werror=strict-prototypes \
35- -Werror=missing-prototypes \
36- -Werror=missing-declarations \
37+ -Wstrict-prototypes \
38+ -Wmissing-prototypes \
39+ -Wmissing-declarations \
40 -Werror=format=2 \
41- -Werror=undef \
42+ -Wundef \
43 -Werror=missing-include-dirs \
44 -Werror=strict-aliasing=2 \
45 -Werror=init-self \
46@@ -579,10 +579,9 @@ AC_DEFUN([CHECK_CCSUPPORT], [
47
48 CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1])
49 CHECK_CCSUPPORT([-Werror=int-conversion], [flg2])
50-CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3])
51 CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4])
52
53-AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"])
54+AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg4"])
55
56 # Make sure that $ACLOCAL_FLAGS are used during a rebuild
57 AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"])