diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-01-12 15:51:47 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-01-12 16:05:39 +0000 |
| commit | bc80e12ab133a00ece4059df40d672889fcf6bf0 (patch) | |
| tree | b00a82f3afbdfbffbd6d15467f21297d70d0bdbb /tests | |
| parent | gcc-config: consolidate profiles sourcing logic in a single function (diff) | |
| download | gcc-config-bc80e12ab133a00ece4059df40d672889fcf6bf0.tar.gz gcc-config-bc80e12ab133a00ece4059df40d672889fcf6bf0.tar.bz2 gcc-config-bc80e12ab133a00ece4059df40d672889fcf6bf0.zip | |
gcc-config: add basic version sorting supportv2.2
Before the change gcc version orderig was relying on bash sorting
in flob matches, like:
cat /etc/env.d/gcc/${CHOST}-* | fgrep LDPATH | tail -n 1
This stopped working with gcc-10, which lexicographically goes
before gcc-9.
The workaround for now is to normalizeversions to fixed-width
and order them lexicographically:
gcc-0009
gcc-0010
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/multi-configs/etc/env.d/gcc/x86_64-pc-linux-gnu-10.0.0 | 9 | ||||
| -rw-r--r-- | tests/multi-configs/etc/env.d/gcc/x86_64-pc-linux-gnu-11.0.0-pre9999 | 8 | ||||
| -rw-r--r-- | tests/multi-configs/test.list.exp | 2 |
3 files changed, 19 insertions, 0 deletions
diff --git a/tests/multi-configs/etc/env.d/gcc/x86_64-pc-linux-gnu-10.0.0 b/tests/multi-configs/etc/env.d/gcc/x86_64-pc-linux-gnu-10.0.0 new file mode 100644 index 0000000..c863019 --- /dev/null +++ b/tests/multi-configs/etc/env.d/gcc/x86_64-pc-linux-gnu-10.0.0 @@ -0,0 +1,9 @@ +GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/10.0.0" +LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/10.0.0:/usr/lib/gcc/x86_64-pc-linux-gnu/10.0.0/32" +MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/10.0.0/man" +INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/10.0.0/info" +STDCXX_INCDIR="g++-v10" +CTARGET="x86_64-pc-linux-gnu" +GCC_SPECS="" +MULTIOSDIRS="../lib64:../lib" + diff --git a/tests/multi-configs/etc/env.d/gcc/x86_64-pc-linux-gnu-11.0.0-pre9999 b/tests/multi-configs/etc/env.d/gcc/x86_64-pc-linux-gnu-11.0.0-pre9999 new file mode 100644 index 0000000..1654050 --- /dev/null +++ b/tests/multi-configs/etc/env.d/gcc/x86_64-pc-linux-gnu-11.0.0-pre9999 @@ -0,0 +1,8 @@ +GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/11.0.0-pre9999" +LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/11.0.0-pre9999:/usr/lib/gcc/x86_64-pc-linux-gnu/11.0.0-pre9999/32" +MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/11.0.0-pre9999/man" +INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/11.0.0-pre9999/info" +STDCXX_INCDIR="g++-v10" +CTARGET="x86_64-pc-linux-gnu" +GCC_SPECS="" +MULTIOSDIRS="../lib64:../lib" diff --git a/tests/multi-configs/test.list.exp b/tests/multi-configs/test.list.exp index 18640e1..5e8db88 100644 --- a/tests/multi-configs/test.list.exp +++ b/tests/multi-configs/test.list.exp @@ -8,3 +8,5 @@ Using gcc-config info in @ROOT@/ [4] x86_64-pc-linux-gnu-4.6.0 [5] x86_64-pc-linux-gnu-4.6.1 [6] x86_64-pc-linux-gnu-4.6.2 * + [7] x86_64-pc-linux-gnu-10.0.0 + [8] x86_64-pc-linux-gnu-11.0.0-pre9999 |