commit: 21350eeab9f743c90186cc341a5e7ed01091179f Author: Z. Liu <zhixu.liu <AT> gmail <DOT> com> AuthorDate: Sat May 3 09:45:17 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun May 11 00:36:03 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21350eea
app-accessibility/flite: don't call ar directly apply patch from upstream Closes: https://bugs.gentoo.org/718048 Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/41914 Closes: https://github.com/gentoo/gentoo/pull/41914 Signed-off-by: Sam James <sam <AT> gentoo.org> .../flite/files/flite-2.2-no-native-ar.patch | 22 ++++++++++++++++++++++ app-accessibility/flite/flite-2.2-r1.ebuild | 3 ++- app-accessibility/flite/flite-2.2-r2.ebuild | 3 ++- app-accessibility/flite/flite-2.2-r3.ebuild | 1 + 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app-accessibility/flite/files/flite-2.2-no-native-ar.patch b/app-accessibility/flite/files/flite-2.2-no-native-ar.patch new file mode 100644 index 000000000000..4f15bb8d4d6d --- /dev/null +++ b/app-accessibility/flite/files/flite-2.2-no-native-ar.patch @@ -0,0 +1,22 @@ +From 54c65164840777326bbb83517568e38a128122ef Mon Sep 17 00:00:00 2001 +From: Rick van Schijndel <[email protected]> +Date: Sat, 27 Feb 2021 11:47:09 +0100 +Subject: [PATCH] common_make_rules: use instead of the native ar command + + +diff --git a/config/common_make_rules b/config/common_make_rules +index 9dfe994..1a45b43 100644 +--- a/config/common_make_rules ++++ b/config/common_make_rules +@@ -122,7 +122,7 @@ $(LIBDIR)/%.so: $(LIBDIR)/%.shared.a + @ echo making $@ + @ rm -rf shared_os && mkdir shared_os + @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} +- @ (cd shared_os && ar x ../$<) ++ @ (cd shared_os && $(AR) x ../$<) + @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDFLAGS)) + @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` ) + @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` ) +-- +2.45.2 + diff --git a/app-accessibility/flite/flite-2.2-r1.ebuild b/app-accessibility/flite/flite-2.2-r1.ebuild index 729ce62ae758..032256ba3029 100644 --- a/app-accessibility/flite/flite-2.2-r1.ebuild +++ b/app-accessibility/flite/flite-2.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -59,6 +59,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.4-audio-interface.patch "${FILESDIR}"/${PN}-2.2-backport-pr30.patch "${FILESDIR}"/${PN}-2.2-make-4.4.patch + "${FILESDIR}"/${PN}-2.2-no-native-ar.patch ) get_audio() { diff --git a/app-accessibility/flite/flite-2.2-r2.ebuild b/app-accessibility/flite/flite-2.2-r2.ebuild index a037ec5ae36c..cfb6c571456e 100644 --- a/app-accessibility/flite/flite-2.2-r2.ebuild +++ b/app-accessibility/flite/flite-2.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -60,6 +60,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.2-backport-pr30.patch "${FILESDIR}"/${PN}-2.2-make-4.4.patch "${FILESDIR}"/${PN}-2.2-backport-pr66.patch + "${FILESDIR}"/${PN}-2.2-no-native-ar.patch ) get_audio() { diff --git a/app-accessibility/flite/flite-2.2-r3.ebuild b/app-accessibility/flite/flite-2.2-r3.ebuild index 58431bfaa790..6ee2e3196df5 100644 --- a/app-accessibility/flite/flite-2.2-r3.ebuild +++ b/app-accessibility/flite/flite-2.2-r3.ebuild @@ -61,6 +61,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.2-make-4.4.patch "${FILESDIR}"/${PN}-2.2-backport-pr66.patch "${FILESDIR}"/${PN}-2.2-remove-const-cast.patch + "${FILESDIR}"/${PN}-2.2-no-native-ar.patch ) get_audio() {
