From afa08a80b8b24f63f207296192a4c57eb18e633cb490d8b2f4f3fda51391d021 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Mon, 21 Aug 2023 14:50:13 +0000 Subject: [PATCH] Accepting request 1105096 from home:varkoly:branches:server:http - Build error on ppc64le: include/import/xxhash.h:4148:9: error: invalid parameter combination for AltiVec intrinsic __builtin_vec_ld Add patch: fix-invalid-parameter-combination-for-AltiVec-intrinsic-__builtin_vec_ld.patch OBS-URL: https://build.opensuse.org/request/show/1105096 OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=290 --- ...tion-for-AltiVec-intrinsic-__builtin_vec_ld.patch | 12 ++++++++++++ haproxy.changes | 7 +++++++ haproxy.spec | 1 + 3 files changed, 20 insertions(+) create mode 100644 fix-invalid-parameter-combination-for-AltiVec-intrinsic-__builtin_vec_ld.patch diff --git a/fix-invalid-parameter-combination-for-AltiVec-intrinsic-__builtin_vec_ld.patch b/fix-invalid-parameter-combination-for-AltiVec-intrinsic-__builtin_vec_ld.patch new file mode 100644 index 0000000..c5e8d39 --- /dev/null +++ b/fix-invalid-parameter-combination-for-AltiVec-intrinsic-__builtin_vec_ld.patch @@ -0,0 +1,12 @@ +--- haproxy-2.8.2+git0.61a0f576a/include/import/xxhash.h.orig 2023-08-18 07:12:28.464256077 +0200 ++++ haproxy-2.8.2+git0.61a0f576a/include/import/xxhash.h 2023-08-18 07:18:38.142879532 +0200 +@@ -4129,7 +4129,8 @@ + const void* XXH_RESTRICT secret) + { + /* presumed aligned */ +- unsigned long long* const xacc = (unsigned long long*) acc; ++ /* unsigned long long* const xacc = (unsigned long long*) acc; */ ++ xxh_u64x2 const* const xacc = (xxh_u64x2 *) acc; + xxh_u64x2 const* const xinput = (xxh_u64x2 const*) input; /* no alignment restriction */ + xxh_u64x2 const* const xsecret = (xxh_u64x2 const*) secret; /* no alignment restriction */ + xxh_u64x2 const v32 = { 32, 32 }; diff --git a/haproxy.changes b/haproxy.changes index 7bd60c3..def7e1c 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 21 14:38:51 UTC 2023 - Peter Varkoly + +- Build error on ppc64le: include/import/xxhash.h:4148:9: error: invalid parameter combination for AltiVec intrinsic __builtin_vec_ld + Add patch: + fix-invalid-parameter-combination-for-AltiVec-intrinsic-__builtin_vec_ld.patch + ------------------------------------------------------------------- Wed Aug 09 12:31:26 UTC 2023 - mrueckert@suse.de diff --git a/haproxy.spec b/haproxy.spec index 2c7f514..31cfd73 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -99,6 +99,7 @@ Source5: haproxy-user.conf Patch1: haproxy-1.6.0_config_haproxy_user.patch Patch2: haproxy-1.6.0-makefile_lib.patch Patch3: haproxy-1.6.0-sec-options.patch +Patch4: fix-invalid-parameter-combination-for-AltiVec-intrinsic-__builtin_vec_ld.patch # Source98: series Source99: haproxy-rpmlintrc