diff options
| author | Marko Ratkaj <marko.ratkaj@sartura.hr> | 2015-07-01 13:13:46 +0200 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2015-07-01 16:23:54 +0200 |
| commit | 6336fe5bce794e1e9eff1057c5d3f1db753c5333 (patch) | |
| tree | 6bfdd140ca7c285c21adbbf31adbdaf9ccbc130e /net/squid/patches | |
| parent | 47315efe2b6a69f3ae23dcc6b88fff38973bb62e (diff) | |
squid: bump version to 3.5.5
Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
Diffstat (limited to 'net/squid/patches')
| -rw-r--r-- | net/squid/patches/001-cross_compile.patch | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/net/squid/patches/001-cross_compile.patch b/net/squid/patches/001-cross_compile.patch index a6cc6e23c..c7493bbce 100644 --- a/net/squid/patches/001-cross_compile.patch +++ b/net/squid/patches/001-cross_compile.patch @@ -1,49 +1,24 @@ --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -7759,7 +7759,7 @@ cache_cf.o: cf_parser.cci - - # cf_gen builds the configuration files. +@@ -7761,3 +7761,3 @@ cache_cf.o: cf_parser.cci cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci - $(BUILDCXX) $(BUILDCXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src + g++ -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src - # squid.conf.default is built by cf_gen when making cf_parser.cci - squid.conf.default squid.conf.documented: cf_parser.cci --- a/configure +++ b/configure -@@ -22935,7 +22935,7 @@ $as_echo_n "checking whether the SSL_get - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling -+_as_fn_error $? "cannot run test program while cross compiling - See \`config.log' for more details" "$LINENO" 5; } - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -22983,7 +22983,7 @@ $as_echo_n "checking whether the workaro - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +@@ -20133,3 +20133,3 @@ if test "$cross_compiling" = yes; then : $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling +_as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -28201,7 +28201,7 @@ else - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +@@ -28289,3 +28289,3 @@ else $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling +_as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -28226,7 +28226,7 @@ else - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +@@ -28314,3 +28314,3 @@ else $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling +_as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |