[06/12] gettext: Use arch independent search paths

Message ID	20260318-fix-checklayer-2-v1-6-388ba6ce47cd@pbarker.dev
State	New
Headers	show Return-Path: <paul@pbarker.dev> ip: 103.168.172.151, mailfrom: paul@pbarker.dev) Feedback-ID: i51494658:Fastmail From: Paul Barker <paul@pbarker.dev> Date: Wed, 18 Mar 2026 17:14:49 +0000 Subject: [PATCH 06/12] gettext: Use arch independent search paths MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260318-fix-checklayer-2-v1-6-388ba6ce47cd@pbarker.dev> References: <20260318-fix-checklayer-2-v1-0-388ba6ce47cd@pbarker.dev> In-Reply-To: <20260318-fix-checklayer-2-v1-0-388ba6ce47cd@pbarker.dev> To: openembedded-core@lists.openembedded.org Cc: Paul Barker <paul@pbarker.dev>
Series	Further check-layer fixes \| expand [00/12] Further check-layer fixes [01/12] checklayer: Fix regex in get_signatures [02/12] curl: Drop arch dependent search paths [03/12] ghostscript: Drop arch dependent search paths [04/12] libssh2: Drop arch dependent search paths [05/12] flac: Use arch independent search path [06/12] gettext: Use arch independent search paths [07/12] gnutls: Use arch independent search paths [08/12] initscripts: Make SRC_URI arch independent [09/12] linux-yocto: Avoid arch dependent vardeps for SRC_URI [10/12] libsdl2: Explicitly set PACKAGECONFIG vardeps [11/12] graphene: Explicitly set PACKAGECONFIG vardeps [12/12] gstreamer1.0-plugins-good: Explicitly set PACKAGECONFIG vardeps

Message ID

20260318-fix-checklayer-2-v1-6-388ba6ce47cd@pbarker.dev

State

New

Headers

Feedback-ID: i51494658:Fastmail
From: Paul Barker <paul@pbarker.dev>
Date: Wed, 18 Mar 2026 17:14:49 +0000
Subject: [PATCH 06/12] gettext: Use arch independent search paths
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20260318-fix-checklayer-2-v1-6-388ba6ce47cd@pbarker.dev>
References: <20260318-fix-checklayer-2-v1-0-388ba6ce47cd@pbarker.dev>
In-Reply-To: <20260318-fix-checklayer-2-v1-0-388ba6ce47cd@pbarker.dev>
To: openembedded-core@lists.openembedded.org
Cc: Paul Barker <paul@pbarker.dev>

Series

Further check-layer fixes | expand

Commit Message

Paul Barker March 18, 2026, 5:14 p.m. UTC

The value of STAGING_LIBDIR depends on baselib, which may be "lib" or
"lib64" depending on the target architecture. To avoid making
PACKAGECONFIG unnecessarily arch-dependent, we can use STAGING_DIR_HOST
as the search prefix for libunistring & ncurses instead.

Signed-off-by: Paul Barker <paul@pbarker.dev>
---
 meta/recipes-core/gettext/gettext_1.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/gettext/gettext_1.0.bb b/meta/recipes-core/gettext/gettext_1.0.bb
index 37e46869a7b6..e20ad8807def 100644
--- a/meta/recipes-core/gettext/gettext_1.0.bb
+++ b/meta/recipes-core/gettext/gettext_1.0.bb
@@ -63,8 +63,8 @@  PACKAGECONFIG[glib] = "--without-included-glib,--with-included-glib,glib-2.0"
 PACKAGECONFIG[libxml] = "--without-included-libxml,--with-included-libxml,libxml2"
 # Need paths here to avoid host contamination but this can cause RPATH warnings
 # or problems if $libdir isn't $prefix/lib.
-PACKAGECONFIG[libunistring] = "--with-libunistring-prefix=${STAGING_LIBDIR}/..,--with-included-libunistring,libunistring"
-PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses,"
+PACKAGECONFIG[libunistring] = "--with-libunistring-prefix=${STAGING_DIR_HOST},--with-included-libunistring,libunistring"
+PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_DIR_HOST},--disable-curses,ncurses,"
 PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux --disable-acl,attr libselinux"
 
 do_install:append:libc-musl () {

[06/12] gettext: Use arch independent search paths

Commit Message

Patch