diff options
| author | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-03-04 09:21:57 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-03-04 09:21:57 +0100 |
| commit | 4fc74012b67cfc62c5481b8d7b6d95052f40c2bf (patch) | |
| tree | d6f7c860195c63564d98f53c143acbf0082ea3ca /package/squid/patches/patch-src_Makefile_am | |
| parent | 68b4cb5aaa95eb39401bcbaa7c517cfd31c3edcf (diff) | |
| parent | 9919c4bc2f53037331313edace085c386c2af4cc (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/squid/patches/patch-src_Makefile_am')
| -rw-r--r-- | package/squid/patches/patch-src_Makefile_am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/squid/patches/patch-src_Makefile_am b/package/squid/patches/patch-src_Makefile_am index 9aec4eca3..049ff3a1d 100644 --- a/package/squid/patches/patch-src_Makefile_am +++ b/package/squid/patches/patch-src_Makefile_am @@ -1,11 +1,11 @@ ---- squid-3.4.4.orig/src/Makefile.am 2014-03-09 10:40:56.000000000 +0100 -+++ squid-3.4.4/src/Makefile.am 2014-03-12 09:46:23.001434141 +0100 -@@ -981,7 +981,7 @@ cache_cf.o: cf_parser.cci +--- squid-3.5.2.orig/src/Makefile.am 2015-02-18 06:17:02.000000000 -0600 ++++ squid-3.5.2/src/Makefile.am 2015-02-23 15:32:32.084583233 -0600 +@@ -970,7 +970,7 @@ cache_cf.o: cf_parser.cci # cf_gen builds the configuration files. cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci -- $(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src -+ $(CXX_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src +- $(BUILDCXX) $(BUILDCXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src ++ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) -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 |