Patchwork [1/1] acl/attr: don't make symlink if base_libdir = libdir

login
register
mail settings
Submitter Saul Wold
Date Oct. 6, 2011, 6:25 p.m.
Message ID <5930749806604b40d1dd6c36ec4b44c2507b4493.1317925433.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/12845/
State New, archived
Headers show

Comments

Saul Wold - Oct. 6, 2011, 6:25 p.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/attr/ea-acl.inc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
Richard Purdie - Oct. 7, 2011, 2:35 p.m.
On Thu, 2011-10-06 at 11:25 -0700, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/recipes-support/attr/ea-acl.inc |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 22d7848..6a45858 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -37,6 +37,9 @@  LDFLAGS_append_libc-uclibc = "${@['', ' -lintl '][(bb.data.getVar('PN', d, True)
 EXTRA_OECONF_append_libc-uclibc = "${@['', ' --disable-gettext '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, 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