~alpine/aports

[alpine-aports] [PATCH] main/squid: fix build on mips{el} (-latomic)

alpine-mips-patches
Details
Message ID
<20181126225521.3BCB764017@mx7.valuehost.ru>
Sender timestamp
1543269943
DKIM signature
missing
Download raw message
Patch: +1 -0
While squid uses the proper autoconf logic to check if the -latomic is required
for 64-bit atomics, its conftest.cpp fails to compile without -fpermissive thus
yielding wrong result on 32-bit MIPS (which, until R6, lacks 64-bit atomics).

Do not bother with configure{.ac} patches (too bulky), do not add -fpermissive
to CXXFLAGS just to fix the conftest.cpp compilation (may affect too much) but
simply pass -latomic preemptibly on mips{el}.

As usual (no previous mips* apks exist, other architectures are unaffected),
keep pkgrel intact.

This commit should be removed when (if) upstream (or, really, autoconf) fixes
the problem.
---
 main/squid/APKBUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index b7af679439..e4af2bde22 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -36,6 +36,7 @@ options="!check"  # does not work. Error message is about "applet not found", so
 
 build() {
 	cd "$builddir"
+	case "$CARCH" in mips|mipsel) export ac_cv_search___atomic_load_8=-latomic ;; esac
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-- 
2.19.1




---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---