diff options
| author | Roman I Khimov <khimov@altell.ru> | 2010-08-19 23:29:28 +0400 |
|---|---|---|
| committer | Roman I Khimov <khimov@altell.ru> | 2010-08-20 09:38:10 +0400 |
| commit | 3a1681c2f7c13c95fc8cf9aef3d7f9427ac45db4 (patch) | |
| tree | 9b611d60edba065bea10a0624ec39fee5f41f52f /recipes/squid/squid-3.1.6/squidv3-build-cf_gen.patch | |
| parent | 03bc424d6266debb03b3a43c9dc02b513aa659a1 (diff) | |
squid: update 3.1.4 to 3.1.6
* bug fixes, considered as safe upgrade
Signed-off-by: Roman I Khimov <khimov@altell.ru>
Diffstat (limited to 'recipes/squid/squid-3.1.6/squidv3-build-cf_gen.patch')
| -rw-r--r-- | recipes/squid/squid-3.1.6/squidv3-build-cf_gen.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/recipes/squid/squid-3.1.6/squidv3-build-cf_gen.patch b/recipes/squid/squid-3.1.6/squidv3-build-cf_gen.patch new file mode 100644 index 0000000000..955acf8007 --- /dev/null +++ b/recipes/squid/squid-3.1.6/squidv3-build-cf_gen.patch @@ -0,0 +1,33 @@ +Index: squid-3.1.4/configure.in +=================================================================== +--- squid-3.1.4.orig/configure.in 2010-05-30 17:21:49.000000000 +0400 ++++ squid-3.1.4/configure.in 2010-07-06 15:41:52.000000000 +0400 +@@ -2116,6 +2116,10 @@ + ;; + esac + ++dnl Define BUILD_CXX ++BUILD_CXX="$BUILD_CXX" ++AC_SUBST(BUILD_CXX) ++ + dnl Check for programs + AC_PROG_CPP + AC_PROG_INSTALL +Index: squid-3.1.4/src/Makefile.am +=================================================================== +--- squid-3.1.4.orig/src/Makefile.am 2010-05-30 17:21:11.000000000 +0400 ++++ squid-3.1.4/src/Makefile.am 2010-07-06 15:42:29.000000000 +0400 +@@ -751,6 +751,13 @@ + squid.conf.default squid.conf.documented: cf_parser.cci + true + ++BUILD_CXX ?= @BUILD_CXX@ ++ ++cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) ++ $(BUILD_CXX) -o $@ $(srcdir)/cf_gen.cc \ ++ $(top_srcdir)/lib/util.c $(top_srcdir)/compat/assert.cc \ ++ -DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES} ++ + cf_parser.cci: cf.data cf_gen$(EXEEXT) + ./cf_gen cf.data $(srcdir)/cf.data.depend + |