| Message ID | 20240117163003.27667-1-william.hauser@meraki.net |
|---|---|
| State | Accepted, archived |
| Commit | 2d7e3d49378257bc02513275b988c8b194e9fd5a |
| Headers | show |
| Series | native.bbclass: base_libdir unique from libdir | expand |
> -----Original Message----- > From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of William Hauser via lists.openembedded.org > Sent: den 17 januari 2024 17:30 > To: openembedded-core@lists.openembedded.org > Cc: William Hauser <william.hauser@meraki.net> > 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. > > Signed-off-by: William Hauser <william.hauser@meraki.net> > --- > meta/classes-recipe/native.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/classes-recipe/native.bbclass b/meta/classes-recipe/native.bbclass > index cfd299d0c8..84a3ec65da 100644 > --- a/meta/classes-recipe/native.bbclass > +++ b/meta/classes-recipe/native.bbclass > @@ -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}" > -- > 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
diff --git a/meta/classes-recipe/native.bbclass b/meta/classes-recipe/native.bbclass index cfd299d0c8..84a3ec65da 100644 --- a/meta/classes-recipe/native.bbclass +++ b/meta/classes-recipe/native.bbclass @@ -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}"
Use STAGING_BASE_LIBDIR_NATIVE for the value of base_libdir instead of STAGING_LIBDIR_NATIVE. This will avoid conflicts between the two directories. Signed-off-by: William Hauser <william.hauser@meraki.net> --- meta/classes-recipe/native.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)