diff options
| author | Bertrand Jacquin <beber@meleeweb.net> | 2009-04-22 22:51:32 +0200 |
|---|---|---|
| committer | Bertrand Jacquin <beber@meleeweb.net> | 2009-04-22 22:51:32 +0200 |
| commit | 8f8512b8fd09ec97df074a1a859cd2893125d4df (patch) | |
| tree | ebae0ed94cee5008f779289248537bcde0d868c0 /net-proxy | |
| parent | openssh: fix building with ldap, missing stdarg.h include (diff) | |
| download | portage-8f8512b8fd09ec97df074a1a859cd2893125d4df.tar.xz | |
squid: second fix, better cleaner
Diffstat (limited to 'net-proxy')
| -rw-r--r-- | net-proxy/squid/Manifest | 4 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid-3.0.13-BJA-cf_gen-HOSTCXX.diff | 51 | ||||
| -rw-r--r-- | net-proxy/squid/squid-3.0.13.ebuild | 2 |
3 files changed, 39 insertions, 18 deletions
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest index 7d84a5a4..7fd4daf9 100644 --- a/net-proxy/squid/Manifest +++ b/net-proxy/squid/Manifest @@ -1,5 +1,5 @@ AUX squid-2.7.3-gentoo.patch 12128 RMD160 5cf6e9b709863c324128b49a9660e76fb22f94f6 SHA1 4778c6f8efa8e043300b59c29286b81bf020818d SHA256 a6f20ea317a7e4b4968aabeddcff0937e0372b2ed45a094284ec56b0563f7874 -AUX squid-3.0.13-BJA-cf_gen-HOSTCXX.diff 718 RMD160 c2ff11b2b70d648c8d232b04fdc8472cfabf8d67 SHA1 c55ff49ba2e61e6c174d7605f3b2d21fee5bca2f SHA256 081a5074e3dd03bdf1cb71986036ae0b2d2253a5215cacdb0203cde474e20511 +AUX squid-3.0.13-BJA-cf_gen-HOSTCXX.diff 992 RMD160 b0f9211b7bfc77b62c776a8639958e842f593abc SHA1 60da0353532f00489b156932f68911eea30ea71a SHA256 55b1cc5b31e93032ef751e9ae82a9c0e7877bc7c0502559634a10133e8808843 AUX squid-3.0.13-BJA-util-cast-xstr.diff 787 RMD160 608c8fe69d2e4fb520ecbd5691b593636e8e31bb SHA1 c36f800c522f4f98d1c6775a2a85c9abb2d798c2 SHA256 00e747d312561a3f5955ceba3ccfb71d13550cf5ee300e1102774869318ee661 AUX squid-3.0.13-adapted-zph.patch 6838 RMD160 5a8728e93498ce03fdcbc1926c63271d562b9671 SHA1 1f6453eb8d00e3ac84b4000aeb14cdf3da54f9d4 SHA256 13f4c3cd42ce662cf0e13fb4ca27b0e50562d22af69aabc373a1ff299c694a29 AUX squid-3.0.13-gentoo.patch 13095 RMD160 5184e54faef48bf5ed8c93d92761e39be8885739 SHA1 f671c6aa4a051b9f454afc08769bafedc3c92f2e SHA256 2209444bdd0149404a77478f8d445cc7a0b4e012a25557dbf8a2e3659b0883d9 @@ -8,4 +8,4 @@ AUX squid-Makefile.am.diff 623 RMD160 affb8af5654361d1d90ce292882f326fe7ddb940 S DIST squid-2.7.STABLE3.tar.gz 1782040 RMD160 80410ce27f3abd0601e10ab5d69099d9f3caaf28 SHA1 0c99054d5fd6537da467acbf299ffe5f1a542ae3 SHA256 d987578c6ca26ca8c8d6fad920580cc39b6ebe95c8ff727b1b6d3c5625fe428d DIST squid-3.0.STABLE13.tar.gz 2454967 RMD160 8da76671013bf4100cbc4c2976e228f81323344e SHA1 6f0f1079a027c64a9f95b7b6c9bdd943af28a42e SHA256 8764fe16c8873bcc5c0c7e5f97b22e70dec186d1182ca4803ec94761bac750e1 EBUILD squid-2.7.3.ebuild 5802 RMD160 8747f84d1cbe8d9a8b406b7006c498310479a3c5 SHA1 169f0233823fd63efe12830cb931994e6c305006 SHA256 71e2a0b10dc566b649fc3eb619ee515fefa4d4e0347340dea4fc01284eadcd86 -EBUILD squid-3.0.13.ebuild 6583 RMD160 3056582f61bd220ea0b38383d9bfe71652da86da SHA1 872d02a764956d19fb7176c528b84fcf8d06ab3f SHA256 395f2e3f8db41ab87f21489ad03aea8e7ed0279db1ec8fae7b6b6cf8f7bf13eb +EBUILD squid-3.0.13.ebuild 6563 RMD160 b7e733a007809a59000c1b3fa0c82a6fe9322945 SHA1 6f92a04f690ce5d0d1c1b5c677ef63911b53b46f SHA256 f1bf14d030360bc6851641e8124b0145ea8dfe7a5e52984c5ddb683377f5a678 diff --git a/net-proxy/squid/files/squid-3.0.13-BJA-cf_gen-HOSTCXX.diff b/net-proxy/squid/files/squid-3.0.13-BJA-cf_gen-HOSTCXX.diff index d9ccf84a..7dcbc0cc 100644 --- a/net-proxy/squid/files/squid-3.0.13-BJA-cf_gen-HOSTCXX.diff +++ b/net-proxy/squid/files/squid-3.0.13-BJA-cf_gen-HOSTCXX.diff @@ -1,15 +1,36 @@ ---- src/Makefile.in.ori 2009-04-17 00:31:36.000000000 +0200 -+++ src/Makefile.in 2009-04-17 00:33:30.000000000 +0200 -@@ -4227,7 +4227,12 @@ - $(CXXLINK) $(DiskIO_DiskDaemon_diskd_OBJECTS) $(DiskIO_DiskDaemon_diskd_LDADD) $(LIBS) - cf_gen$(EXEEXT): $(cf_gen_OBJECTS) $(cf_gen_DEPENDENCIES) - @rm -f cf_gen$(EXEEXT) -+ifneq (${HOSTCXX},${CXXLINK}) -+ ${HOSTCXX} ${INCLUDES} -DNDEBUG -DBUILD_HOST_TOOL -o cf_gen$(EXEEXT) \ -+ $(srcdir)/cf_gen.cc $(top_srcdir)/lib/util.c $(top_srcdir)/lib/assert.c -+else - $(CXXLINK) $(cf_gen_OBJECTS) $(cf_gen_LDADD) $(LIBS) -+endif - dnsserver$(EXEEXT): $(dnsserver_OBJECTS) $(dnsserver_DEPENDENCIES) - @rm -f dnsserver$(EXEEXT) - $(CXXLINK) $(dnsserver_OBJECTS) $(dnsserver_LDADD) $(LIBS) +--- configure.in.ori 2009-04-22 00:43:57.000000000 +0200 ++++ configure.in 2009-04-22 22:28:14.000000000 +0200 +@@ -1821,6 +1821,10 @@ + ;; + esac + ++dnl Define HOSTCXX ++HOSTCXX="$build-g++" ++AC_SUBST(HOSTCXX) ++ + dnl Check for programs + AC_PROG_CPP + AC_PROG_INSTALL +--- src/Makefile.am.ori 2009-04-22 00:46:20.000000000 +0200 ++++ src/Makefile.am 2009-04-22 22:29:06.000000000 +0200 +@@ -1007,6 +1007,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 +@@ -1030,6 +1032,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 + diff --git a/net-proxy/squid/squid-3.0.13.ebuild b/net-proxy/squid/squid-3.0.13.ebuild index 6e3475bb..3570643d 100644 --- a/net-proxy/squid/squid-3.0.13.ebuild +++ b/net-proxy/squid/squid-3.0.13.ebuild @@ -64,11 +64,11 @@ src_unpack() { cd "${S}" || die "source dir not found" epatch "${FILESDIR}"/${P}-gentoo.patch epatch "${FILESDIR}"/${P}-BJA-util-cast-xstr.diff + epatch "${FILESDIR}"/${P}-BJA-cf_gen-HOSTCXX.diff use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${P}-heimdal.patch eautoreconf - use elibc_uclibc && epatch "${FILESDIR}"/${P}-BJA-cf_gen-HOSTCXX.diff } src_compile() { |