fix hard-coded .so file extension

From: Etienne Cordonnier <ecordonnier@snap.com>

E.g. Darwin uses .dylib instead.

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
---
 meta/recipes-core/libxcrypt/libxcrypt.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

On 25 May 2023, at 14:22, Etienne Cordonnier via lists.openembedded.org <ecordonnier=snap.com@lists.openembedded.org> wrote:
> 
> From: Etienne Cordonnier <ecordonnier@snap.com>
> 
> E.g. Darwin uses .dylib instead.
> 
> Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
> ---
> meta/recipes-core/libxcrypt/libxcrypt.inc | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc
> index 61b0381076..7b484d86bc 100644
> --- a/meta/recipes-core/libxcrypt/libxcrypt.inc
> +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
> @@ -17,10 +17,10 @@ SRC_URI += "file://fix_cflags_handling.patch"
> 
> PROVIDES = "virtual/crypt"
> 
> -FILES:${PN} = "${libdir}/libcrypt*.so.* \
> -               ${libdir}/libcrypt-*.so \
> -               ${libdir}/libowcrypt*.so.* \
> -               ${libdir}/libowcrypt-*.so \
> +FILES:${PN} = "${libdir}/libcrypt*${SOLIBS} \
> +               ${libdir}/libcrypt-*${SOLIBSDEV} \
> +               ${libdir}/libowcrypt*${SOLIBS} \
> +               ${libdir}/libowcrypt-*${SOLIBSDEV} \
> “

Is this actually right though? The current packaging is:

libxcrypt:
	/usr/lib/libcrypt.so.2
	/usr/lib/libcrypt.so.2.0.0
libxcrypt-dev:
	/usr/include/crypt.h
	/usr/lib/libcrypt.so
	/usr/lib/pkgconfig/libcrypt.pc
	/usr/lib/pkgconfig/libxcrypt.pc

Which is what I’d expect.  I suspect removing this FILES statement would result in the same packaging and work on Darwin too.

Ross

Good point. I had a look at the git history of libxcrypt and at the git
history of poky, and I didn't find anything producing a file
"libcrypt-*.so". Maybe this was just a copy-paste mistake?
Removing FILES:${PN} altogether indeed does not change the files contained
in libxcrypt and libxcrypt-dev. I'll send an updated patch.

On Thu, May 25, 2023 at 9:09 PM Ross Burton <Ross.Burton@arm.com> wrote:

> On 25 May 2023, at 14:22, Etienne Cordonnier via lists.openembedded.org
> <ecordonnier=snap.com@lists.openembedded.org> wrote:
> >
> > From: Etienne Cordonnier <ecordonnier@snap.com>
> >
> > E.g. Darwin uses .dylib instead.
> >
> > Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
> > ---
> > meta/recipes-core/libxcrypt/libxcrypt.inc | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc
> b/meta/recipes-core/libxcrypt/libxcrypt.inc
> > index 61b0381076..7b484d86bc 100644
> > --- a/meta/recipes-core/libxcrypt/libxcrypt.inc
> > +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
> > @@ -17,10 +17,10 @@ SRC_URI += "file://fix_cflags_handling.patch"
> >
> > PROVIDES = "virtual/crypt"
> >
> > -FILES:${PN} = "${libdir}/libcrypt*.so.* \
> > -               ${libdir}/libcrypt-*.so \
> > -               ${libdir}/libowcrypt*.so.* \
> > -               ${libdir}/libowcrypt-*.so \
> > +FILES:${PN} = "${libdir}/libcrypt*${SOLIBS} \
> > +               ${libdir}/libcrypt-*${SOLIBSDEV} \
> > +               ${libdir}/libowcrypt*${SOLIBS} \
> > +               ${libdir}/libowcrypt-*${SOLIBSDEV} \
> > “
>
> Is this actually right though? The current packaging is:
>
> libxcrypt:
>         /usr/lib/libcrypt.so.2
>         /usr/lib/libcrypt.so.2.0.0
> libxcrypt-dev:
>         /usr/include/crypt.h
>         /usr/lib/libcrypt.so
>         /usr/lib/pkgconfig/libcrypt.pc
>         /usr/lib/pkgconfig/libxcrypt.pc
>
> Which is what I’d expect.  I suspect removing this FILES statement would
> result in the same packaging and work on Darwin too.
>
> Ross