Author: stsp
Date: Sun Jun 5 14:49:12 2011
New Revision: 1132430
URL: http://svn.apache.org/viewvc?rev=1132430&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Prefer the 'grep' utility found in $PATH
over what autoconf wants. Autoconf usually prefers GNU grep which is ggrep
on some systems -- and which happened to be (temporarily?) broken for me
causing build failures.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1132430&r1=1132429&r2=1132430&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Sun Jun 5 14:49:12 2011
@@ -226,7 +226,7 @@ $(BDB_OBJDIR)/.retrieved: $(DISTDIR)/$(B
# configure bdb
$(BDB_OBJDIR)/.configured: $(BDB_OBJDIR)/.retrieved
cd $(BDB_SRCDIR)/build_unix \
- && env CFLAGS="-g $(PROFILE_CFLAGS)" \
+ && env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`" \
../dist/configure \
--prefix=$(PREFIX)/bdb \
--enable-debug
@@ -280,7 +280,7 @@ $(APR_OBJDIR)/.configured: $(APR_OBJDIR)
> $(APR_SRCDIR)/build/apr_hints.m4
cd $(APR_SRCDIR) && ./buildconf
cd $(APR_OBJDIR) \
- && env CFLAGS="-O0 -g $(PROFILE_CFLAGS)" \
+ && env CFLAGS="-O0 -g $(PROFILE_CFLAGS)" GREP="`which grep`" \
$(APR_SRCDIR)/configure \
--prefix=$(PREFIX)/apr \
--enable-maintainer-mode \
@@ -325,7 +325,7 @@ $(APR_ICONV_OBJDIR)/.retrieved: $(DISTDI
# configure apr-iconv
$(APR_ICONV_OBJDIR)/.configured: $(APR_ICONV_OBJDIR)/.retrieved
cd $(APR_ICONV_OBJDIR) \
- && env CFLAGS="-g $(PROFILE_CFLAGS)" \
+ && env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`" \
$(APR_ICONV_SRCDIR)/configure \
--prefix=$(PREFIX)/apr \
--with-apr=$(PREFIX)/apr
@@ -405,7 +405,7 @@ $(GNU_ICONV_OBJDIR)/.configured: $(GNU_I
cd $(SRCDIR)/libiconv-${GNU_ICONV_VER} && \
${MAKE} -f Makefile.devel lib/aliases.h
cd $(GNU_ICONV_OBJDIR) \
- && env CFLAGS="-g $(PROFILE_CFLAGS)" \
+ && env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`"\
$(GNU_ICONV_SRCDIR)/configure \
--prefix=$(PREFIX)/iconv \
--enable-extra-encodings
@@ -474,6 +474,7 @@ $(APR_UTIL_OBJDIR)/.configured: $(APR_UT
cd $(APR_UTIL_OBJDIR) \
&& env LD_LIBRARY_PATH=$(PREFIX)/bdb/lib \
CFLAGS="-O0 -g $(PROFILE_CFLAGS)" \
+ GREP="`which grep`" \
$(APR_UTIL_SRCDIR)/configure \
--prefix=$(PREFIX)/apr \
--enable-maintainer-mode \
@@ -521,7 +522,7 @@ $(HTTPD_OBJDIR)/.retrieved: $(DISTDIR)/$
# configure httpd
$(HTTPD_OBJDIR)/.configured: $(HTTPD_OBJDIR)/.retrieved
cd $(HTTPD_OBJDIR) \
- && CFLAGS="-g $(PROFILE_CFLAGS)" \
+ && env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`" \
$(HTTPD_SRCDIR)/configure \
--prefix=$(PREFIX)/httpd \
--enable-maintainer-mode \
@@ -601,7 +602,7 @@ $(NEON_OBJDIR)/.configured: $(NEON_OBJDI
chmod +x $(NEON_OBJDIR)/krb5-config; \
fi
cd $(NEON_OBJDIR) \
- && env CFLAGS="-g $(PROFILE_CFLAGS)" \
+ && env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`" \
$(NEON_SRCDIR)/configure \
PATH=$(NEON_OBJDIR):$$PATH \
--prefix=$(PREFIX)/neon \
@@ -751,7 +752,7 @@ endif
# configure sqlite
$(SQLITE_OBJDIR)/.configured: $(SQLITE_OBJDIR)/.retrieved
cd $(SQLITE_OBJDIR) \
- && env CFLAGS="-g $(PROFILE_CFLAGS)" \
+ && env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`" \
$(SQLITE_SRCDIR)/configure \
--prefix=$(PREFIX)/sqlite \
--disable-tcl \
@@ -812,6 +813,7 @@ $(CYRUS_SASL_OBJDIR)/.configured: $(CYRU
cd $(CYRUS_SASL_OBJDIR) \
&& env CFLAGS="-g $(PROFILE_CFLAGS)" \
CPPFLAGS="-I/usr/include/kerberosV" \
+ GREP="`which grep`" \
$(CYRUS_SASL_SRCDIR)/configure \
--with-dbpath=$(PREFIX)/cyrus-sasl/etc/sasldb2 \
--with-plugindir=$(PREFIX)/cyrus-sasl/lib/sasl2 \
@@ -861,7 +863,7 @@ $(LIBMAGIC_OBJDIR)/.retrieved: $(DISTDIR
# configure libmagic
$(LIBMAGIC_OBJDIR)/.configured: $(LIBMAGIC_OBJDIR)/.retrieved
cd $(LIBMAGIC_OBJDIR) \
- && env CFLAGS="-g $(PROFILE_CFLAGS)" \
+ && env CFLAGS="-g $(PROFILE_CFLAGS)" GREP="`which grep`"\
$(LIBMAGIC_SRCDIR)/configure \
--enable-fsect-man5 \
--prefix=$(PREFIX)/libmagic
@@ -1000,6 +1002,7 @@ $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)
cd $(svn_builddir) && \
env LDFLAGS="-L$(PREFIX)/neon/lib -L$(PREFIX)/apr/lib" \
LD_LIBRARY_PATH="$(PREFIX)/bdb/lib:$(PREFIX)/iconv/lib:$$LD_LIBRARY_PATH" \
+ GREP="`which grep`" \
$(SVN_SRCDIR)/configure \
--enable-maintainer-mode \
--with-ssl \
