[PATCH 0/1] acl/attr fix for libdir = base_libdir

[PATCH 0/1] acl/attr fix for libdir = base_libdir

[Saul Wold]

Richard,

This should address the above situation.

Phil, please let me know if this works for you.

Thanks

Sau!

The following changes since commit cc626b9e1671670a931ea3e528ea4b0f7b2e923b:

  webkit-gtk: Enable dependency tracking since the webkit makefiles have bugs (2011-10-05 14:36:18 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib sgw/fix
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix

Saul Wold (1):
  acl/attr: don't make symlink if base_libdir = libdir

 meta/recipes-support/attr/ea-acl.inc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

-- 
1.7.6.2

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

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/attr/ea-acl.inc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

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
-- 
1.7.6.2

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

[Richard Purdie]

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

Re: [PATCH 0/1] acl/attr fix for libdir = base_libdir

[Phil Blundell]

On Thu, 2011-10-06 at 11:25 -0700, Saul Wold wrote:
> Richard,
> 
> This should address the above situation.
> 
> Phil, please let me know if this works for you.

Yes, thanks, that seems to be working fine now.

p.