[patch] Updated cross-compile patch for offset changes

squid-3.0.25-cross-compile.patch (text/plain), 1.35 KB, created by Brian De Wolf on 2010-03-24 23:38:41 UTC

diff -ur squid-3.0.STABLE25.orig/configure.in squid-3.0.STABLE25.cross-compile.patch/configure.in
--- squid-3.0.STABLE25.orig/configure.in	2010-03-13 21:45:43.000000000 -0800
+++ squid-3.0.STABLE25.cross-compile.patch/configure.in	2010-03-24 13:29:01.000000000 -0800
@@ -1845,6 +1845,10 @@
 	;;
 esac
 
+dnl Define HOSTCXX
+HOSTCXX="$build-g++"
+AC_SUBST(HOSTCXX)
+
 dnl Check for programs
 AC_PROG_CPP
 AC_PROG_INSTALL
Only in squid-3.0.STABLE25.cross-compile.patch/: configure.in.orig
diff -ur squid-3.0.STABLE25.orig/src/Makefile.am squid-3.0.STABLE25.cross-compile.patch/src/Makefile.am
--- squid-3.0.STABLE25.orig/src/Makefile.am	2010-03-13 21:45:41.000000000 -0800
+++ squid-3.0.STABLE25.cross-compile.patch/src/Makefile.am	2010-03-24 13:29:01.000000000 -0800
@@ -1011,6 +1011,8 @@
 
 DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
 
+HOSTCXX ?= @HOSTCXX@
+
 $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
 
 snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h
@@ -1034,6 +1036,11 @@
 squid.conf.default: cf_parser.h
 	true
 
+cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
+	$(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc \
+		$(top_srcdir)/lib/util.c $(top_srcdir)/lib/assert.c \
+		-DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES}
+
 cf_parser.h: cf.data cf_gen$(EXEEXT)
 	./cf_gen cf.data $(srcdir)/cf.data.depend