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
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
|
diff --git a/deps/README.rst b/deps/README.rst
index 8e331699..a0e3712d 100644
--- a/deps/README.rst
+++ b/deps/README.rst
@@ -53,7 +53,15 @@ Updating c-ares
At this point there might be new files in c-ares that need added to
git, evaluate them and add them.
- Note that the patch may not apply cleanly.
+ Note that the patch may not apply cleanly. If not, commit the
+ changes before the patch. Then manually apply them by editing the
+ three files to remove the references to ``docs`` and ``test``; this
+ is easiest to do by reading the existing patch file and searching
+ for the relevant lines in the target files. Once this is working
+ correctly, create the new patch using ``git diff -p --minimal -w``
+ (note that you cannot directly redirect the output of this into
+ ``cares-make.patch``, or you'll get the diff of the patch itself in
+ the diff!).
- Follow the same 'config.guess' and 'config.sub' steps as libev.
diff --git a/deps/c-ares/Makefile.am b/deps/c-ares/Makefile.am
index eef3d3d1..c3e37f73 100644
--- a/deps/c-ares/Makefile.am
+++ b/deps/c-ares/Makefile.am
@@ -16,7 +16,7 @@ CLEANFILES = $(PDFPAGES) $(HTMLPAGES)
DISTCLEANFILES = include/ares_build.h
-DIST_SUBDIRS = include src test docs
+DIST_SUBDIRS = include src
SUBDIRS = @BUILD_SUBDIRS@
diff --git a/deps/c-ares/Makefile.in b/deps/c-ares/Makefile.in
index 3dfa479a..db261682 100644
--- a/deps/c-ares/Makefile.in
+++ b/deps/c-ares/Makefile.in
@@ -413,7 +413,7 @@ EXTRA_DIST = AUTHORS CHANGES README.cares $(man_MANS) RELEASE-NOTES \
CLEANFILES = $(PDFPAGES) $(HTMLPAGES)
DISTCLEANFILES = include/ares_build.h
-DIST_SUBDIRS = include src test docs
+DIST_SUBDIRS = include src
SUBDIRS = @BUILD_SUBDIRS@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcares.pc
diff --git a/deps/c-ares/configure b/deps/c-ares/configure
index 2f182e0c..1a6af2cb 100755
--- a/deps/c-ares/configure
+++ b/deps/c-ares/configure
@@ -34612,18 +34612,18 @@ fi
printf "%s\n" "$build_tests" >&6; }
-BUILD_SUBDIRS="include src docs"
+BUILD_SUBDIRS="include src"
if test "x$build_tests" = "xyes" ; then
subdirs="$subdirs test"
- BUILD_SUBDIRS="${BUILD_SUBDIRS} test"
+ BUILD_SUBDIRS="${BUILD_SUBDIRS}"
fi
-ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile src/lib/Makefile src/tools/Makefile docs/Makefile libcares.pc"
+ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile src/lib/Makefile src/tools/Makefile libcares.pc"
cat >confcache <<\_ACEOF
@@ -35769,7 +35769,6 @@ do
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;
"src/tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/Makefile" ;;
- "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
"libcares.pc") CONFIG_FILES="$CONFIG_FILES libcares.pc" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@@ -37464,6 +37463,3 @@ done
## -------------------------------- ##
## End of distclean amending code ##
## -------------------------------- ##
-
-
-
diff --git a/deps/c-ares/configure.ac b/deps/c-ares/configure.ac
index 54e79d6e..3b216010 100644
--- a/deps/c-ares/configure.ac
+++ b/deps/c-ares/configure.ac
@@ -954,7 +954,7 @@ fi
AC_MSG_RESULT([$build_tests])
-BUILD_SUBDIRS="include src docs"
+BUILD_SUBDIRS="include src"
if test "x$build_tests" = "xyes" ; then
AC_CONFIG_SUBDIRS([test])
BUILD_SUBDIRS="${BUILD_SUBDIRS} test"
@@ -967,7 +967,6 @@ AC_CONFIG_FILES([Makefile \
src/Makefile \
src/lib/Makefile \
src/tools/Makefile \
- docs/Makefile \
libcares.pc ])
AC_OUTPUT
|
