From 6377b4c91315f0b5e1da1177e347627b8033852b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Van=C4=9Bk?= Date: Fri, 17 Feb 2023 16:11:23 +0100 Subject: [PATCH] net-proxy/haproxy: fix musl support in all available versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TARGET needs to be set to linux-musl for proper musl support. It is available since version 2.2, therefore all currently present ebuilds are updated appropriately. Closes: https://bugs.gentoo.org/866053 Signed-off-by: Petr Vaněk Closes: https://github.com/gentoo/gentoo/pull/29637 Signed-off-by: Sam James --- net-proxy/haproxy/haproxy-2.2.25.ebuild | 9 +++++++-- net-proxy/haproxy/haproxy-2.2.29.ebuild | 7 ++++++- net-proxy/haproxy/haproxy-2.2.9999.ebuild | 9 +++++++-- net-proxy/haproxy/haproxy-2.4.18.ebuild | 9 +++++++-- net-proxy/haproxy/haproxy-2.4.22.ebuild | 7 ++++++- net-proxy/haproxy/haproxy-2.4.9999.ebuild | 9 +++++++-- net-proxy/haproxy/haproxy-2.6.9.ebuild | 7 ++++++- net-proxy/haproxy/haproxy-2.6.9999.ebuild | 9 +++++++-- net-proxy/haproxy/haproxy-2.7.3.ebuild | 7 ++++++- net-proxy/haproxy/haproxy-2.7.9999.ebuild | 9 +++++++-- net-proxy/haproxy/haproxy-9999.ebuild | 9 +++++++-- 11 files changed, 73 insertions(+), 18 deletions(-) diff --git a/net-proxy/haproxy/haproxy-2.2.25.ebuild b/net-proxy/haproxy/haproxy-2.2.25.ebuild index 93008743019cd..dc5155b408dac 100644 --- a/net-proxy/haproxy/haproxy-2.2.25.ebuild +++ b/net-proxy/haproxy/haproxy-2.2.25.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -75,12 +75,17 @@ pkg_setup() { src_compile() { local -a args=( V=1 - TARGET=linux-glibc # Switching to PCRE2 by default, bug 838013 PCRE= PCRE_JIT= ) + if use elibc_musl; then + args+=( TARGET=linux-musl ) + else + args+=( TARGET=linux-glibc ) + fi + # TODO: PCRE2_WIDTH? args+=( $(haproxy_use threads THREAD) ) args+=( $(haproxy_use crypt LIBCRYPT) ) diff --git a/net-proxy/haproxy/haproxy-2.2.29.ebuild b/net-proxy/haproxy/haproxy-2.2.29.ebuild index 5a6ecbd9677d8..752bdc4828b3d 100644 --- a/net-proxy/haproxy/haproxy-2.2.29.ebuild +++ b/net-proxy/haproxy/haproxy-2.2.29.ebuild @@ -75,12 +75,17 @@ pkg_setup() { src_compile() { local -a args=( V=1 - TARGET=linux-glibc # Switching to PCRE2 by default, bug 838013 PCRE= PCRE_JIT= ) + if use elibc_musl; then + args+=( TARGET=linux-musl ) + else + args+=( TARGET=linux-glibc ) + fi + # TODO: PCRE2_WIDTH? args+=( $(haproxy_use threads THREAD) ) args+=( $(haproxy_use crypt LIBCRYPT) ) diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild index 2bf20bf3ac64a..752bdc4828b3d 100644 --- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -75,12 +75,17 @@ pkg_setup() { src_compile() { local -a args=( V=1 - TARGET=linux-glibc # Switching to PCRE2 by default, bug 838013 PCRE= PCRE_JIT= ) + if use elibc_musl; then + args+=( TARGET=linux-musl ) + else + args+=( TARGET=linux-glibc ) + fi + # TODO: PCRE2_WIDTH? args+=( $(haproxy_use threads THREAD) ) args+=( $(haproxy_use crypt LIBCRYPT) ) diff --git a/net-proxy/haproxy/haproxy-2.4.18.ebuild b/net-proxy/haproxy/haproxy-2.4.18.ebuild index a0008b4be30cc..883ab8118c3fb 100644 --- a/net-proxy/haproxy/haproxy-2.4.18.ebuild +++ b/net-proxy/haproxy/haproxy-2.4.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -70,12 +70,17 @@ pkg_setup() { src_compile() { local -a args=( V=1 - TARGET=linux-glibc # Switching to PCRE2 by default, bug 838013 PCRE= PCRE_JIT= ) + if use elibc_musl; then + args+=( TARGET=linux-musl ) + else + args+=( TARGET=linux-glibc ) + fi + # TODO: PCRE2_WIDTH? args+=( $(haproxy_use threads THREAD) ) args+=( $(haproxy_use crypt LIBCRYPT) ) diff --git a/net-proxy/haproxy/haproxy-2.4.22.ebuild b/net-proxy/haproxy/haproxy-2.4.22.ebuild index 1dc2f69b3bad4..a4d1fb37c08b2 100644 --- a/net-proxy/haproxy/haproxy-2.4.22.ebuild +++ b/net-proxy/haproxy/haproxy-2.4.22.ebuild @@ -71,12 +71,17 @@ pkg_setup() { src_compile() { local -a args=( V=1 - TARGET=linux-glibc # Switching to PCRE2 by default, bug 838013 PCRE= PCRE_JIT= ) + if use elibc_musl; then + args+=( TARGET=linux-musl ) + else + args+=( TARGET=linux-glibc ) + fi + # TODO: PCRE2_WIDTH? args+=( $(haproxy_use threads THREAD) ) args+=( $(haproxy_use crypt LIBCRYPT) ) diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild index ab90e472bdf02..ff2118770d3f2 100644 --- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -70,12 +70,17 @@ pkg_setup() { src_compile() { local -a args=( V=1 - TARGET=linux-glibc # Switching to PCRE2 by default, bug 838013 PCRE= PCRE_JIT= ) + if use elibc_musl; then + args+=( TARGET=linux-musl ) + else + args+=( TARGET=linux-glibc ) + fi + # TODO: PCRE2_WIDTH? args+=( $(haproxy_use threads THREAD) ) args+=( $(haproxy_use crypt LIBCRYPT) ) diff --git a/net-proxy/haproxy/haproxy-2.6.9.ebuild b/net-proxy/haproxy/haproxy-2.6.9.ebuild index 83227697a6a55..7c18e82dbedb7 100644 --- a/net-proxy/haproxy/haproxy-2.6.9.ebuild +++ b/net-proxy/haproxy/haproxy-2.6.9.ebuild @@ -70,12 +70,17 @@ pkg_setup() { src_compile() { local -a args=( V=1 - TARGET=linux-glibc # Switching to PCRE2 by default, bug 838013 PCRE= PCRE_JIT= ) + if use elibc_musl; then + args+=( TARGET=linux-musl ) + else + args+=( TARGET=linux-glibc ) + fi + # TODO: PCRE2_WIDTH? args+=( $(haproxy_use threads THREAD) ) args+=( $(haproxy_use crypt LIBCRYPT) ) diff --git a/net-proxy/haproxy/haproxy-2.6.9999.ebuild b/net-proxy/haproxy/haproxy-2.6.9999.ebuild index fd42fd4cb0850..7c18e82dbedb7 100644 --- a/net-proxy/haproxy/haproxy-2.6.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.6.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -70,12 +70,17 @@ pkg_setup() { src_compile() { local -a args=( V=1 - TARGET=linux-glibc # Switching to PCRE2 by default, bug 838013 PCRE= PCRE_JIT= ) + if use elibc_musl; then + args+=( TARGET=linux-musl ) + else + args+=( TARGET=linux-glibc ) + fi + # TODO: PCRE2_WIDTH? args+=( $(haproxy_use threads THREAD) ) args+=( $(haproxy_use crypt LIBCRYPT) ) diff --git a/net-proxy/haproxy/haproxy-2.7.3.ebuild b/net-proxy/haproxy/haproxy-2.7.3.ebuild index 83227697a6a55..7c18e82dbedb7 100644 --- a/net-proxy/haproxy/haproxy-2.7.3.ebuild +++ b/net-proxy/haproxy/haproxy-2.7.3.ebuild @@ -70,12 +70,17 @@ pkg_setup() { src_compile() { local -a args=( V=1 - TARGET=linux-glibc # Switching to PCRE2 by default, bug 838013 PCRE= PCRE_JIT= ) + if use elibc_musl; then + args+=( TARGET=linux-musl ) + else + args+=( TARGET=linux-glibc ) + fi + # TODO: PCRE2_WIDTH? args+=( $(haproxy_use threads THREAD) ) args+=( $(haproxy_use crypt LIBCRYPT) ) diff --git a/net-proxy/haproxy/haproxy-2.7.9999.ebuild b/net-proxy/haproxy/haproxy-2.7.9999.ebuild index fd42fd4cb0850..7c18e82dbedb7 100644 --- a/net-proxy/haproxy/haproxy-2.7.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.7.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -70,12 +70,17 @@ pkg_setup() { src_compile() { local -a args=( V=1 - TARGET=linux-glibc # Switching to PCRE2 by default, bug 838013 PCRE= PCRE_JIT= ) + if use elibc_musl; then + args+=( TARGET=linux-musl ) + else + args+=( TARGET=linux-glibc ) + fi + # TODO: PCRE2_WIDTH? args+=( $(haproxy_use threads THREAD) ) args+=( $(haproxy_use crypt LIBCRYPT) ) diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild index fd42fd4cb0850..7c18e82dbedb7 100644 --- a/net-proxy/haproxy/haproxy-9999.ebuild +++ b/net-proxy/haproxy/haproxy-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -70,12 +70,17 @@ pkg_setup() { src_compile() { local -a args=( V=1 - TARGET=linux-glibc # Switching to PCRE2 by default, bug 838013 PCRE= PCRE_JIT= ) + if use elibc_musl; then + args+=( TARGET=linux-musl ) + else + args+=( TARGET=linux-glibc ) + fi + # TODO: PCRE2_WIDTH? args+=( $(haproxy_use threads THREAD) ) args+=( $(haproxy_use crypt LIBCRYPT) )