Skip to contentSkip to conversation

binconfig: don't try to fix up .la files

PATCH In review Ross Burton 2 participants 4 messages Jun 18, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 binconfig: don't try to fix up .la files

If we're going to clean buildpaths from installed .la files then we should do it globally, not in a class that only six recipes in oe-core use.

---
 meta/classes/binconfig.bbclass | 9 ---------
 1 file changed, 9 deletions(-)
meta/classes/binconfig.bbclass +0 -9
index 133b9537cf0..9112ed46085 100644
@@ -40,15 +40,6 @@ binconfig_package_preprocess () {
 		    -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \
                     $config
 	done
-	for lafile in `find ${PKGD} -type f -name "*.la"` ; do
-		sed -i \
-		    -e 's:${STAGING_BASELIBDIR}:${base_libdir}:g;' \
-		    -e 's:${STAGING_LIBDIR}:${libdir}:g;' \
-		    -e 's:${STAGING_INCDIR}:${includedir}:g;' \
-		    -e 's:${STAGING_DATADIR}:${datadir}:' \
-		    -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \
-		    $lafile
-	done	    
 }
 
 SYSROOT_PREPROCESS_FUNCS += "binconfig_sysroot_preprocess"
Signature · 1 line
2.11.0
#1 lore raw
Quoted 4 lines · Ross Burton

If we're going to clean buildpaths from installed .la files then we should do it globally, not in a class that only six recipes in oe-core use.

while I agree, are there assumptions in the recipes using binconfig on this ? especially packages outside oe-core ?

Quoted 33 lines
---
 meta/classes/binconfig.bbclass | 9 ---------
 1 file changed, 9 deletions(-)
meta/classes/binconfig.bbclass +0 -10
index 133b9537cf0..9112ed46085 100644
@@ -40,15 +40,6 @@ binconfig_package_preprocess () {
                    -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \
                     $config
        done
-       for lafile in `find ${PKGD} -type f -name "*.la"` ; do
-               sed -i \
-                   -e 's:${STAGING_BASELIBDIR}:${base_libdir}:g;' \
-                   -e 's:${STAGING_LIBDIR}:${libdir}:g;' \
-                   -e 's:${STAGING_INCDIR}:${includedir}:g;' \
-                   -e 's:${STAGING_DATADIR}:${datadir}:' \
-                   -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \
-                   $lafile
-       done
 }
 
 SYSROOT_PREPROCESS_FUNCS += "binconfig_sysroot_preprocess"
--

2.11.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#2 lore raw
Quoted 2 lines · Khem Raj

while I agree, are there assumptions in the recipes using binconfig on this ? especially packages outside oe-core ?

I suspect that everyone is using remove-libtool, because that's one of the default inherits.

Ross

#3 lore raw
Quoted 8 lines · Ross
Quoted 2 lines · Khem Raj

while I agree, are there assumptions in the recipes using binconfig on this ? especially packages outside oe-core ?

I suspect that everyone is using remove-libtool, because that's one of the default inherits.

I see, that makes sense. So it was just redundant then

Quoted 1 line

Ross