diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2024-05-27 15:17:43 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2024-06-11 14:03:58 -0500 |
| commit | 5843ac4c228e7423b9aa424e0d5c35b5e4f94b3c (patch) | |
| tree | e2e5330bb531bc3b85f6b46c7211fc7db9ef2339 | |
| parent | e0c053a53d9da2c6ec6b07140d7c82ed2d0cc7de (diff) | |
| download | packages-5843ac4c228e7423b9aa424e0d5c35b5e4f94b3c.tar.gz packages-5843ac4c228e7423b9aa424e0d5c35b5e4f94b3c.tar.bz2 packages-5843ac4c228e7423b9aa424e0d5c35b5e4f94b3c.tar.xz packages-5843ac4c228e7423b9aa424e0d5c35b5e4f94b3c.zip | |
user/bash-completion: Workaround for GCC 13
Non-x86 arches don't have -march= or -mtune=generic.
This has been reported upstream.
| -rw-r--r-- | user/bash-completion/APKBUILD | 4 | ||||
| -rw-r--r-- | user/bash-completion/gcc-x86-tests.patch | 22 |
2 files changed, 25 insertions, 1 deletions
diff --git a/user/bash-completion/APKBUILD b/user/bash-completion/APKBUILD index 2862108d5..81a7355ed 100644 --- a/user/bash-completion/APKBUILD +++ b/user/bash-completion/APKBUILD @@ -15,6 +15,7 @@ makedepends="" subpackages="$pkgname-doc" source="https://github.com/scop/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz fix-tests.patch + gcc-x86-tests.patch " # Provided with util-linux and networkmanager: @@ -82,4 +83,5 @@ package() { } sha512sums="41585f730b5114d397831ba36d10d05643c6a6179e746ddc49aa1cbef61ea5525fd2f09b2e474adee14e647f99df8d5983ee48e29a59d8a30e1daf7fb1837e06 bash-completion-2.11.tar.xz -ada80cbec419a6f6b2eab648497d5aa6795883bc52a160c233c04d4479c6d543b5089745ab098c5d6d7b4a0f05d25708cf7cf9d3b565b5b70e96796b3042ca75 fix-tests.patch" +ada80cbec419a6f6b2eab648497d5aa6795883bc52a160c233c04d4479c6d543b5089745ab098c5d6d7b4a0f05d25708cf7cf9d3b565b5b70e96796b3042ca75 fix-tests.patch +fb65b60f52da373368dfb5fd8034ca6b2be4c68648d827679596908364d0e0a69ede51c2954411ad5d83cfc4ee7666eeade2b036f2b5f52c004a9dba51f328a7 gcc-x86-tests.patch" diff --git a/user/bash-completion/gcc-x86-tests.patch b/user/bash-completion/gcc-x86-tests.patch new file mode 100644 index 000000000..49d7838b0 --- /dev/null +++ b/user/bash-completion/gcc-x86-tests.patch @@ -0,0 +1,22 @@ +Now that we have a GCC that supports completions, we have a few test failures. + +* -march=native is an x86-specific flag. There is no -march on Power. + +* -mtune=generic is x86 and Arm specific; Power's equivalent is powerpc. + +Upstream-URL: https://github.com/scop/bash-completion/issues/1201 + +--- bash-completion-2.11/test/t/test_gcc.py.old 2020-07-25 06:49:49.000000000 -0500 ++++ bash-completion-2.11/test/t/test_gcc.py 2024-05-26 21:16:26.236036406 -0500 +@@ -56,9 +56,9 @@ + assert completion == "fam10" + + @pytest.mark.complete("gcc -march=") +- def test_march_native(self, completion, gcc_with_completion): ++ def test_march_native(self, completion, gcc_with_completion, gcc_x86): + assert "native" in completion + + @pytest.mark.complete("gcc -mtune=") +- def test_mtune_generic(self, completion, gcc_with_completion): ++ def test_mtune_generic(self, completion, gcc_with_completion, gcc_x86): + assert "generic" in completion |