Skip to contentSkip to conversation

native.bbclass: base_libdir unique from libdir

PATCH In review William Hauser 2 participants 2 messages Jan 17, 2024 – Jan 31, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 native.bbclass: base_libdir unique from libdir

Use STAGING_BASE_LIBDIR_NATIVE for the value of base_libdir instead of STAGING_LIBDIR_NATIVE. This will avoid conflicts between the two directories.

---
 meta/classes-recipe/native.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-recipe/native.bbclass +1 -1
index cfd299d0c8..84a3ec65da 100644
@@ -77,7 +77,7 @@ exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
 
 bindir = "${STAGING_BINDIR_NATIVE}"
 sbindir = "${STAGING_SBINDIR_NATIVE}"
-base_libdir = "${STAGING_LIBDIR_NATIVE}"
+base_libdir = "${STAGING_BASE_LIBDIR_NATIVE}"
 libdir = "${STAGING_LIBDIR_NATIVE}"
 includedir = "${STAGING_INCDIR_NATIVE}"
 sysconfdir = "${STAGING_ETCDIR_NATIVE}"
Signature · 1 line
2.34.1
#1 lore raw
Quoted 30 lines

-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of William Hauser via lists.openembedded.org
Sent: den 17 januari 2024 17:30
To: [email protected]
Cc: William Hauser <[email protected]>
Subject: [OE-core] [PATCH] native.bbclass: base_libdir unique from libdir

Use STAGING_BASE_LIBDIR_NATIVE for the value of base_libdir instead of STAGING_LIBDIR_NATIVE. This will avoid conflicts between the two directories.

---
 meta/classes-recipe/native.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-recipe/native.bbclass +1 -2
index cfd299d0c8..84a3ec65da 100644
@@ -77,7 +77,7 @@ exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
 
 bindir = "${STAGING_BINDIR_NATIVE}"
 sbindir = "${STAGING_SBINDIR_NATIVE}"
-base_libdir = "${STAGING_LIBDIR_NATIVE}"
+base_libdir = "${STAGING_BASE_LIBDIR_NATIVE}"
 libdir = "${STAGING_LIBDIR_NATIVE}"
 includedir = "${STAGING_INCDIR_NATIVE}"
 sysconfdir = "${STAGING_ETCDIR_NATIVE}"
--
Quoted 1 line

2.34.1

What was the actual motivation for this change? I cannot see a reason for using /lib with native where it has always (for some definition of always) used only /usr/lib. It seems odd to start using it now when usrmerge is more or less standard these days.

In my book, any recipe that does not handle that base_libdir == libdir is faulty and should be corrected (rather than changing the global configuration). This is because that is what happens when usrmerge is set in DISTRO_FEATURES (which is perfectly valid to do also for native).

//Peter