From: Roy Li <rongqing...@windriver.com>
The relative-libdir.patch is no longer needed for native since fix_symlink
for native has been added to revert what it done, Also this patch and
fix_symlink add a race condition since both libacl.so and libattr.so were
created, then removed, and then recreated.
So Only keep relative-libdir.patch for the target.
Signed-off-by: Roy Li <rongqing...@windriver.com>
---
meta/recipes-support/attr/ea-acl.inc | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/meta/recipes-support/attr/ea-acl.inc
b/meta/recipes-support/attr/ea-acl.inc
index 474291a..64df16e 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -1,6 +1,7 @@
# this build system is mostly shared by attr and acl
-SRC_URI += "file://relative-libdir.patch;striplevel=0 \
+SRC_URI_append_class-target = " \
+ file://relative-libdir.patch;striplevel=0 \
"
inherit autotools-brokensep gettext
@@ -25,23 +26,3 @@ BBCLASSEXTEND = "native"
# Only append ldflags for target recipe and if USE_NLS is enabled
LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl
'][(d.getVar('USE_NLS', True) == 'yes')]}"
EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext
'][(d.getVar('USE_NLS', True) == 'no')]}"
-
-fix_symlink () {
- if test "${libdir}" = "${base_libdir}" ; then
- return
- fi
- # Remove bad symlinks & create the correct symlinks
- if test -L ${libdir}/lib${BPN}.so ; then
- rm -rf ${libdir}/lib${BPN}.so
- ln -sf ${base_libdir}/lib${BPN}.so ${libdir}/lib${BPN}.so
- fi
- if test -L ${base_libdir}/lib${BPN}.a ; then
- rm -rf ${base_libdir}/lib${BPN}.a
- ln -sf ${libdir}/lib${BPN}.a ${base_libdir}/lib${BPN}.a
- fi
- if test -L ${base_libdir}/lib${BPN}.la ; then
- rm -rf ${base_libdir}/lib${BPN}.la
- ln -sf ${libdir}/lib${BPN}.la ${base_libdir}/lib${BPN}.la
- fi
-}
-SSTATEPOSTINSTFUNCS_class-native += "fix_symlink"
--
1.9.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
