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

Message ID 20190618104735.25849-1-ross.burton@intel.com
State Accepted
Commit bd4e2cd3f70243f52215f8c92bcd7eb088a9b9f6
Headers show
Series
  • binconfig: don't try to fix up .la files
Related show

Commit Message

Ross Burton June 18, 2019, 10:47 a.m.
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 meta/classes/binconfig.bbclass | 9 ---------
 1 file changed, 9 deletions(-)

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Khem Raj June 18, 2019, 3:51 p.m. | #1
On Tue, Jun 18, 2019 at 3:47 AM Ross Burton <ross.burton@intel.com> wrote:
>

> 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 ?

> Signed-off-by: Ross Burton <ross.burton@intel.com>

> ---

>  meta/classes/binconfig.bbclass | 9 ---------

>  1 file changed, 9 deletions(-)

>

> diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass

> index 133b9537cf0..9112ed46085 100644

> --- a/meta/classes/binconfig.bbclass

> +++ b/meta/classes/binconfig.bbclass

> @@ -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

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Ross Burton June 18, 2019, 3:55 p.m. | #2
On Tue, 18 Jun 2019 at 16:51, Khem Raj <raj.khem@gmail.com> wrote:
> 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
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Khem Raj June 18, 2019, 4 p.m. | #3
On Tue, Jun 18, 2019 at 8:55 AM Burton, Ross <ross.burton@intel.com> wrote:
>

> On Tue, 18 Jun 2019 at 16:51, Khem Raj <raj.khem@gmail.com> wrote:

> > 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

> Ross

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 133b9537cf0..9112ed46085 100644
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -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"