diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-13 09:11:48 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-13 09:11:48 +0100 |
| commit | 607c3fcd1d10a37c077c870df450b5389fb519bf (patch) | |
| tree | 9c7c0e209d6373efe2296e379c63c29d27a8847b /package/squid/files/autotool.patch | |
| parent | c16eb800d935d903d2ab38b3da8270324284e973 (diff) | |
| parent | f42fb988bae9d402b0b204614b54ba9b4261d877 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/squid/files/autotool.patch')
| -rw-r--r-- | package/squid/files/autotool.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/package/squid/files/autotool.patch b/package/squid/files/autotool.patch deleted file mode 100644 index 151e22879..000000000 --- a/package/squid/files/autotool.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Nur squid-3.1.11.orig/configure.ac squid-3.1.11/configure.ac ---- squid-3.1.11.orig/configure.ac 2011-02-08 05:07:06.000000000 +0100 -+++ squid-3.1.11/configure.ac 2011-03-04 23:03:25.000000000 +0100 -@@ -3913,6 +3913,9 @@ - fi - AC_SUBST(XTRA_LIBS) - -+CXX_FOR_BUILD="g++" -+AC_SUBST(CXX_FOR_BUILD) -+ - dnl Clean up after OSF/1 core dump bug - rm -f core - -diff -Nur squid-3.1.11.orig/src/Makefile.am squid-3.1.11/src/Makefile.am ---- squid-3.1.11.orig/src/Makefile.am 2011-02-08 05:05:51.000000000 +0100 -+++ squid-3.1.11/src/Makefile.am 2011-03-04 23:16:39.000000000 +0100 -@@ -732,6 +732,8 @@ - # Make location configure settings available to the code - DEFS += -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -DDEFAULT_SQUID_DATA_DIR=\"$(datadir)\" -DDEFAULT_SQUID_CONFIG_DIR=\"$(sysconfdir)\" - -+CXX_FOR_BUILD ?= @CXX_FOR_BUILD@ -+ - snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h - - globals.cc: globals.h mk-globals-c.pl -@@ -753,6 +755,11 @@ - squid.conf.default squid.conf.documented: cf_parser.cci - true - -+cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) -+ $(CXX_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc \ -+ $(top_srcdir)/lib/util.c $(top_srcdir)/compat/assert.cc \ -+ -DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES} ${CXXFLAGS_FOR_BUILD} -+ - cf_parser.cci: cf.data cf_gen$(EXEEXT) - ./cf_gen cf.data $(srcdir)/cf.data.depend - |