natas_hw
/
grpc
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sed failure on mac

This commit is contained in:
Yuchen Zeng 2016-08-15 13:46:59 -07:00
parent 979937315f
commit 7ef54b662f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1252,9 +1252,9 @@ $(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\])/{} # issue 44/g' third_party/c-ares/configure.ac
$(Q)sed -i'.bak' -e '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 --disable-shared)
$(Q)sed -i 's/{} # issue 44/AC_CONFIG_SUBDIRS(\[test\])/g' third_party/c-ares/configure.ac
$(Q)mv third_party/c-ares/configure.ac.bak third_party/c-ares/configure.ac
$(LIBDIR)/$(CONFIG)/c-ares/libcares.a: third_party/c-ares/configure
$(E) "[MAKE] Building c-ares"

4
templates/Makefile.template
View File

@ -894,9 +894,9 @@
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\])/{} # issue 44/g' third_party/c-ares/configure.ac
$(Q)sed -i'.bak' -e '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 --disable-shared)
$(Q)sed -i 's/{} # issue 44/AC_CONFIG_SUBDIRS(\[test\])/g' third_party/c-ares/configure.ac
$(Q)mv third_party/c-ares/configure.ac.bak third_party/c-ares/configure.ac
$(LIBDIR)/$(CONFIG)/c-ares/libcares.a: third_party/c-ares/configure
$(E) "[MAKE] Building c-ares"