| 1 |
commit: a6a3bd3ef1f8235e923c7e5fd5cc54bc29d14721 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 6 11:33:54 2022 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 6 11:33:54 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a6a3bd3e |
| 7 |
|
| 8 |
sys-devel/gcc-config: use version_sorted_paths iso sort -V |
| 9 |
|
| 10 |
Oversight on my part, just use the version_sorted_paths function which |
| 11 |
may use sort -V in the future, but for now is the way to order the |
| 12 |
versions (which works fine) |
| 13 |
|
| 14 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 15 |
|
| 16 |
.../gcc-config/files/gcc-config-2.7-gcc-libs-ordered.patch | 10 +++------- |
| 17 |
1 file changed, 3 insertions(+), 7 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-devel/gcc-config/files/gcc-config-2.7-gcc-libs-ordered.patch b/sys-devel/gcc-config/files/gcc-config-2.7-gcc-libs-ordered.patch |
| 20 |
index e15e83015f..63494e4813 100644 |
| 21 |
--- a/sys-devel/gcc-config/files/gcc-config-2.7-gcc-libs-ordered.patch |
| 22 |
+++ b/sys-devel/gcc-config/files/gcc-config-2.7-gcc-libs-ordered.patch |
| 23 |
@@ -6,19 +6,15 @@ with older binaries. |
| 24 |
|
| 25 |
--- gcc-config-2.7/gcc-config |
| 26 |
+++ gcc-config-2.7/gcc-config |
| 27 |
-@@ -619,8 +619,13 @@ |
| 28 |
+@@ -619,8 +619,9 @@ |
| 29 |
rmdir "${sourcedir}" |
| 30 |
} |
| 31 |
|
| 32 |
- # We don't rely on iteration order here. |
| 33 |
- local GCC_PROFILES=$(LC_ALL="C" ls ${GCC_ENV_D}/${CHOST}-*) |
| 34 |
+ # We want the latest version to provide the final link to an object, |
| 35 |
-+ # for gcc's libs should be backwards compatible, so use sort -V to |
| 36 |
-+ # get that ordering -- take into account that sort may not support |
| 37 |
-+ # -V (yet). Then it is better to just do whatever order ls reports. |
| 38 |
-+ local srt='sort --version-sort' |
| 39 |
-+ sort --help | grep -q -- --version-sort || srt='cat' |
| 40 |
-+ local GCC_PROFILES=$(LC_ALL="C" ls ${GCC_ENV_D}/${CHOST}-* | ${srt}) |
| 41 |
++ # for gcc's libs should be backwards compatible |
| 42 |
++ local GCC_PROFILES=$(version_sorted_paths ${GCC_ENV_D}/${CHOST}-*) |
| 43 |
|
| 44 |
local targetdirs= GCC_PATH= LDPATH= |
| 45 |
for x in ${GCC_PROFILES} ; do |
Archives