Add walkaround for github.com/c-ares/c-ares/issues/44

9 years ago · f914c1d970
parent b1b2115a26
commit f914c1d970
2 changed files with 4 additions and 0 deletions
--- a/2
+++ b/2
@ -1251,6 +1251,8 @@ $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a: third_party/protobuf/configure

 third_party/c-ares/configure:
 	$(E) "[AUTOGEN] Preparing c-ares"
+	# Walkaround for github.com/c-ares/c-ares/issues/44
+	$(Q)sed -i 's/AC_CONFIG_SUBDIRS(\[test\])/{}/g' third_party/c-ares/configure.ac
 	$(Q)(cd third_party/c-ares; ./buildconf; CC="$(CC)" CXX="$(CXX)" LDFLAGS="$(LDFLAGS_$(CONFIG)) -g $(CARES_LDFLAGS_EXTRA)" CFLAGS="-g $(CARES_CFLAGS_EXTRA)" CPPFLAGS="$(PIC_CPPFLAGS) $(CPPFLAGS_$(CONFIG)) -g $(CARES_CPPFLAGS_EXTRA)" ./configure)

 $(LIBDIR)/$(CONFIG)/c-ares/libcares.a: third_party/c-ares/configure
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@ -893,6 +893,8 @@

  third_party/c-ares/configure:
  	$(E) "[AUTOGEN] Preparing c-ares"
+  	# Walkaround for github.com/c-ares/c-ares/issues/44
+  	$(Q)sed -i 's/AC_CONFIG_SUBDIRS(\[test\])/{}/g' third_party/c-ares/configure.ac
  	$(Q)(cd third_party/c-ares; ./buildconf; CC="$(CC)" CXX="$(CXX)" LDFLAGS="$(LDFLAGS_$(CONFIG)) -g $(CARES_LDFLAGS_EXTRA)" CFLAGS="-g $(CARES_CFLAGS_EXTRA)" CPPFLAGS="$(PIC_CPPFLAGS) $(CPPFLAGS_$(CONFIG)) -g $(CARES_CPPFLAGS_EXTRA)" ./configure)

  $(LIBDIR)/$(CONFIG)/c-ares/libcares.a: third_party/c-ares/configure