diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2021-12-23 22:07:48 +0100 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2022-01-02 12:18:55 +0100 |
| commit | 88a020c8438369bdfc9e8d44fe9a0a0689588f19 (patch) | |
| tree | a3b68c38a8ad01ee35e528be5062a96c0d7253ed /profiles/default | |
| parent | app-text/openpaperwork-gtk: add missing libhandy dep (diff) | |
| download | gentoo-88a020c8438369bdfc9e8d44fe9a0a0689588f19.tar.gz gentoo-88a020c8438369bdfc9e8d44fe9a0a0689588f19.tar.bz2 gentoo-88a020c8438369bdfc9e8d44fe9a0a0689588f19.zip | |
profiles: consolidate arch/riscv files
Now this is the big and ugly one. Since the 17.0 profiles are gone now, we can
simplify...
* All information from riscv/rv32imac and riscv/rv64gc is moved into their
subdirs; these two are not valid profile dirs anymore.
* A new subdir riscv/rv64gc/lp64d-multilib is created as replacement.
* We do not by default pull in multilib and disable it then everywhere anymore.
Instead we only pull in multilib in the riscv/rv64gc/lp64d-multilib dir.
* The make.defaults in riscv specifies the two-level libdirs used ONLY
for multilib secondary ABI (i.e. in practice never except when experimenting).
The libdir for the primary, default ABI MUST be overridden in the specific
profile to a single-level path.
* This makes the need for the 1level directory go away.
* We use for the default ABI "lib64" (64bit) or "lib" (32bit) to keep the
structure of other arches, as also stated in the specs as fallback.
Note that the 2-level libdirs for 32bit remain lib32/*; using lib/* here
does not work.
* default/linux/riscv now pulls in arch/riscv,
default/linux/riscv/20.0/rv64gc and default/linux/riscv/20.0/rv32imac
build on that but add no further arch dir.
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Diffstat (limited to 'profiles/default')
5 files changed, 2 insertions, 14 deletions
diff --git a/profiles/default/linux/riscv/20.0/rv32imac/parent b/profiles/default/linux/riscv/20.0/rv32imac/parent index 4e6e3225bf31..b8f5b5cbc9d2 100644 --- a/profiles/default/linux/riscv/20.0/rv32imac/parent +++ b/profiles/default/linux/riscv/20.0/rv32imac/parent @@ -1,4 +1,2 @@ ../.. -../../../../../arch/riscv/rv32imac ../../../../../releases/17.0 -../../../../../arch/riscv/1level diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/make.defaults b/profiles/default/linux/riscv/20.0/rv64gc/multilib/make.defaults deleted file mode 100644 index 42e660f1a345..000000000000 --- a/profiles/default/linux/riscv/20.0/rv64gc/multilib/make.defaults +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# we need to reset the two-level libdirs here, otherwise the one-level -# paths lead to collisions... note that the default abi libdir remains -# "lib64" - -LIBDIR_lp64="lib64/lp64" -LIBDIR_ilp32d="lib32/ilp32d" -LIBDIR_ilp32="lib32/ilp32" diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent b/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent index f3229c5b9876..eef8b55d0efc 100644 --- a/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent +++ b/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent @@ -1 +1,2 @@ .. +../../../../../../arch/riscv/rv64gc/lp64d-multilib diff --git a/profiles/default/linux/riscv/20.0/rv64gc/parent b/profiles/default/linux/riscv/20.0/rv64gc/parent index 0f380a1962bb..b8f5b5cbc9d2 100644 --- a/profiles/default/linux/riscv/20.0/rv64gc/parent +++ b/profiles/default/linux/riscv/20.0/rv64gc/parent @@ -1,4 +1,2 @@ ../.. -../../../../../arch/riscv/rv64gc ../../../../../releases/17.0 -../../../../../arch/riscv/1level diff --git a/profiles/default/linux/riscv/parent b/profiles/default/linux/riscv/parent index 9f9d2cbed246..1f65d976126f 100644 --- a/profiles/default/linux/riscv/parent +++ b/profiles/default/linux/riscv/parent @@ -1,2 +1,3 @@ ../../../base .. +../../../arch/riscv |