diff options
| author |   Cliff Brake <cbrake@bec-systems.com> | 2010-11-12 00:00:20 -0500 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2010-11-12 00:00:20 -0500 |
| commit | 3c6efe8f8abc16668ca5e9cdf7a46665dac87172 (patch) | |
| tree | 642c13416b99e80f0871cdc6668e832e635dfb48 /recipes/squid/squid-3.1.9/squidv3-build-cf_gen.patch | |
| parent | c400c874f2ac9233b8a43a73309b6e7907289c54 (diff) | |
| parent | 13fbe7253c95881ede787004a4c3a1c31502e5c6 (diff) | |
| download | openembedded-testing.tar.gz | |
Merge branch 'master' into testing-nexttested_2010-11-12testing
Diffstat (limited to 'recipes/squid/squid-3.1.9/squidv3-build-cf_gen.patch')
| -rw-r--r-- | recipes/squid/squid-3.1.9/squidv3-build-cf_gen.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/recipes/squid/squid-3.1.9/squidv3-build-cf_gen.patch b/recipes/squid/squid-3.1.9/squidv3-build-cf_gen.patch new file mode 100644 index 0000000000..955acf8007 --- /dev/null +++ b/recipes/squid/squid-3.1.9/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 + |