fix hard-coded .so file extension
PATCH 1/1 fix hard-coded .so file extension
From: Etienne Cordonnier <[email protected]>
E.g. Darwin uses .dylib instead.
--- meta/recipes-core/libxcrypt/libxcrypt.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-core/libxcrypt/libxcrypt.inc +4 -4
@@ -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} \ " S = "${WORKDIR}/git"
Signature · 1 line
2.36.1.vfs.0.0
Quoted 26 lines · Etienne Cordonnier via lists.openembedded.org
From: Etienne Cordonnier <[email protected]>
E.g. Darwin uses .dylib instead.
Signed-off-by Etienne Cordonnier <[email protected]>---
meta/recipes-core/libxcrypt/libxcrypt.inc | 8 ++++----1 file changed, 4 insertions(+), 4 deletions(-)meta/recipes-core/libxcrypt/libxcrypt.inc +0
-0@@ -17,10 +17,10 @@ SRC_URI += "file://fix_cflags_handling.patch"PROVIDES = "virtual/crypt"
meta/recipes-core/libxcrypt/libxcrypt.inc +4
-4-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} \
Quoted 1 line
“
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.
Quoted 46 lines · Ross Burton
Review
Quoted 11 lines · Etienne Cordonnier via lists.openembedded.org
From: Etienne Cordonnier <[email protected]>
E.g. Darwin uses .dylib instead.
Signed-off-by Etienne Cordonnier <[email protected]>---
meta/recipes-core/libxcrypt/libxcrypt.inc | 8 ++++----1 file changed, 4 insertions(+), 4 deletions(-)(quoted diff) +0
-0b/meta/recipes-core/libxcrypt/libxcrypt.inc
Quoted 15 lines
index
61b0381076..7b484d86bc100644meta/recipes-core/libxcrypt/libxcrypt.inc +0
-0@@ -17,10 +17,10 @@ SRC_URI += "file://fix_cflags_handling.patch"PROVIDES = "virtual/crypt"
meta/recipes-core/libxcrypt/libxcrypt.inc +4
-4-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} \Quoted 1 line
“
Is this actually right though? The current packaging is:
libxcrypt:
/usr/lib/libcrypt.so.2 /usr/lib/libcrypt.so.2.0.0libxcrypt-dev:
/usr/include/crypt.h
/usr/lib/libcrypt.so
/usr/lib/pkgconfig/libcrypt.pc
/usr/lib/pkgconfig/libxcrypt.pcWhich is what I’d expect. I suspect removing this FILES statement would result in the same packaging and work on Darwin too.
Ross