| 1 |
commit: f0ef8838240c82dd67689b80bbb45d4c3d490296 |
| 2 |
Author: Kan Yan <kyan <AT> google <DOT> com> |
| 3 |
AuthorDate: Tue Jan 9 20:04:07 2018 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 9 20:10:35 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ef8838 |
| 7 |
|
| 8 |
net-proxy/squid: fix cross-compiling |
| 9 |
|
| 10 |
Current versions of squid have a run test for gnu atomics w/no |
| 11 |
cross-compile fallback causing builds to fail. Upstream has |
| 12 |
rewritten this completely, so until we update to a newer version, |
| 13 |
force the cache variable when cross-compiling. Forcing it to no |
| 14 |
might not be optimal in all cases, but it's better than nothing. |
| 15 |
|
| 16 |
We have been turning on large-file-system support for a while now, |
| 17 |
but the configure test for that probes the build system for flags |
| 18 |
to compile with (via `getconf ...`). These flags don't work for |
| 19 |
the cross-compile target, and in reality are rarely necessary. By |
| 20 |
selecting the default, we always go the standard POSIX route with |
| 21 |
the -D_FILE_OFFSET_BITS=64 flag. If a target doesn't respect that |
| 22 |
flag, then it might fail to build, but we can wait for anyone to |
| 23 |
complain. |
| 24 |
|
| 25 |
net-proxy/squid/squid-3.5.27.ebuild | 5 +++++ |
| 26 |
1 file changed, 5 insertions(+) |
| 27 |
|
| 28 |
diff --git a/net-proxy/squid/squid-3.5.27.ebuild b/net-proxy/squid/squid-3.5.27.ebuild |
| 29 |
index 97b9d9c2897..5ccd7f6f458 100644 |
| 30 |
--- a/net-proxy/squid/squid-3.5.27.ebuild |
| 31 |
+++ b/net-proxy/squid/squid-3.5.27.ebuild |
| 32 |
@@ -158,6 +158,10 @@ src_configure() { |
| 33 |
export BUILDCXXFLAGS=${BUILD_CXXFLAGS} |
| 34 |
tc-export CC AR |
| 35 |
|
| 36 |
+ # Should be able to drop this workaround with newer versions. |
| 37 |
+ # https://bugs.squid-cache.org/show_bug.cgi?id=4224 |
| 38 |
+ tc-is-cross-compiler && export squid_cv_gnu_atomics=no |
| 39 |
+ |
| 40 |
econf \ |
| 41 |
--sysconfdir=/etc/squid \ |
| 42 |
--libexecdir=/usr/libexec/squid \ |
| 43 |
@@ -182,6 +186,7 @@ src_configure() { |
| 44 |
--enable-icmp \ |
| 45 |
--enable-follow-x-forwarded-for \ |
| 46 |
--with-large-files \ |
| 47 |
+ --with-build-environment=default \ |
| 48 |
--disable-strict-error-checking \ |
| 49 |
--disable-arch-native \ |
| 50 |
--with-ltdl-includedir=/usr/include \ |
Archives