From f71a62353f5a42a92da1493026f49483f7344709 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 19 Dec 2016 09:00:24 -0700 Subject: [PATCH 1/3] glibc-external: fix libm* fixup We don't want the 'libm*.so.*' kept in our FILES, as it's too greedy, and results in picking up the wrong things. Signed-off-by: Christopher Larson --- recipes-external/glibc/glibc-external.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-external/glibc/glibc-external.bb b/recipes-external/glibc/glibc-external.bb index 6b51310..1dea375 100644 --- a/recipes-external/glibc/glibc-external.bb +++ b/recipes-external/glibc/glibc-external.bb @@ -152,7 +152,7 @@ python () { # Ensure that we pick up just libm, not all libs that start with m baselibs = d.getVar('libc_baselibs', False) - baselibs.replace('${base_libdir}/libm*.so.*', '${base_libdir}/libm.so.*') + baselibs = baselibs.replace('${base_libdir}/libm*.so.*', '${base_libdir}/libm.so.*') d.setVar('libc_baselibs', baselibs) } From 75590b4dcd6a573e7f13f2a3ba90a8ba064c8528 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 19 Dec 2016 09:16:34 -0700 Subject: [PATCH 2/3] glibc-external: also remove ${base_libdir}/*_nonshared.a This overly greedy pattern was picking up, via the FILES_MIRRORS, the nonshared paths in ${libdir}. Signed-off-by: Christopher Larson --- recipes-external/glibc/glibc-external.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-external/glibc/glibc-external.bb b/recipes-external/glibc/glibc-external.bb index 1dea375..919a2da 100644 --- a/recipes-external/glibc/glibc-external.bb +++ b/recipes-external/glibc/glibc-external.bb @@ -217,5 +217,5 @@ do_package_write_ipk[depends] += "${MLPREFIX}libgcc:do_packagedata" do_package_write_deb[depends] += "${MLPREFIX}libgcc:do_packagedata" do_package_write_rpm[depends] += "${MLPREFIX}libgcc:do_packagedata" -FILES_${PN}-dev_remove = "${libdir}/*_nonshared.a" +FILES_${PN}-dev_remove = "${base_libdir}/*_nonshared.a ${libdir}/*_nonshared.a" FILES_${PN}-dev += "${libdir}/libc_nonshared.a ${libdir}/libpthread_nonshared.a" From 46c4867c32ed250843a2765308a1ee4683b064c8 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 19 Dec 2016 09:16:03 -0700 Subject: [PATCH 3/3] glibc-external: keep libmvec We drop the overly greedy patterns for libm* and *_nonshared and explicitly add back the bits we know we own, but libmvec was missing from this. Signed-off-by: Christopher Larson --- recipes-external/glibc/glibc-external.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-external/glibc/glibc-external.bb b/recipes-external/glibc/glibc-external.bb index 919a2da..770f4bd 100644 --- a/recipes-external/glibc/glibc-external.bb +++ b/recipes-external/glibc/glibc-external.bb @@ -152,7 +152,7 @@ python () { # Ensure that we pick up just libm, not all libs that start with m baselibs = d.getVar('libc_baselibs', False) - baselibs = baselibs.replace('${base_libdir}/libm*.so.*', '${base_libdir}/libm.so.*') + baselibs = baselibs.replace('${base_libdir}/libm*.so.*', '${base_libdir}/libm.so.* ${base_libdir}/libmvec.so.*') d.setVar('libc_baselibs', baselibs) } @@ -218,4 +218,4 @@ do_package_write_deb[depends] += "${MLPREFIX}libgcc:do_packagedata" do_package_write_rpm[depends] += "${MLPREFIX}libgcc:do_packagedata" FILES_${PN}-dev_remove = "${base_libdir}/*_nonshared.a ${libdir}/*_nonshared.a" -FILES_${PN}-dev += "${libdir}/libc_nonshared.a ${libdir}/libpthread_nonshared.a" +FILES_${PN}-dev += "${libdir}/libc_nonshared.a ${libdir}/libpthread_nonshared.a ${libdir}/libmvec_nonshared.a"