From e5edcfd797cfd2f0d3878b8ad6033b2160df83d9 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Sat, 6 May 2023 10:46:30 +0200 Subject: multilib.eclass: Drop CONF_LIBDIR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The CONF_LIBDIR variable was used exclusively in the 2004.3 profile (i.e. it was no longer defined in 2005.0), before the ABI and LIBDIR_${ABI} variables existed. Simply use "lib" as default, which is consistent with get_libdir(). Bug: https://bugs.gentoo.org/267159 Signed-off-by: Ulrich Müller --- eclass/multilib.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index 4a6e4160d5cb..77340a23e30f 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -26,7 +26,7 @@ export CFLAGS_default export LDFLAGS_default export CHOST_default=${CHOST_default:-${CHOST}} export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}} -export LIBDIR_default=${CONF_LIBDIR:-"lib"} +export LIBDIR_default="lib" export KERNEL_ABI=${KERNEL_ABI:-${DEFAULT_ABI}} # @FUNCTION: has_multilib_profile -- cgit v1.2.3-65-gdbad