From cf1849501bce54f0eef31f41abcfdff69a3dcff9 Mon Sep 17 00:00:00 2001
From: Andreas Müller <schnitzeltony@gmx.de>
Date: Sat, 19 Feb 2011 19:53:39 +0000
Subject: cross.bbclass: Fix many QA RPATH errors for distros preferring
 libtool-2.2

* This patch removes the absolute path in sysroots/<arch>/usr/lib/libstdc++.la
*
* It was build tested wih clean tmp for xfce46-image. Additional known
* QA-RPATH-error-candidates were checked for successful build:
*
* aspell-0.60.6-r0
* curl-7.21.2-r4.0
* clutter-box2d-0.10.0-r2.0+git4e72b9c135a9439b82d801c62422531db611f98b
* enchant-1.6.0-r2
* gnome-vfs-2.24.1-r3
* libcdio-0.82-r3.0
* libsoup-2.2.100-r1:
* neon-0.25.5-r4
* schroedinger-1.0.9-r0
* tiff-3.9.4+4.0.0beta6-r0
*
* Build environment was (RPATH QA errors treated as fatal / acl fixed manually)
*
* BB_VERSION        = "1.10.2"
* METADATA_BRANCH   = "cross-bbclass-test"
* METADATA_REVISION = "a44300e"
* TARGET_ARCH       = "arm"
* TARGET_OS         = "linux-gnueabi"
* MACHINE           = "overo"
* DISTRO            = "angstrom"
* DISTRO_VERSION    = "2010.7-test-20110219"
* TARGET_FPU        = "hard"
*
* Notes:
* - To have effect, gcc-cross has to be rebuild (changing all gcc packed
*   was not an option)
* - This patch does not affect libtool-2.4 distos
* - The story is found at
*   http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-February/030115.html

Signed-off-by: Andreas Mueller <schnitzeltony@gmx.de>
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 classes/cross.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index 1a6d906780..50c0f63102 100644
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -75,6 +75,6 @@ sysroot_stage_all() {
 
 #
 # Cross .la files have more path issues we have to correct only for libtool < 2.4
-SYSROOTEXTRALIBDIRSED_OLD = " -e \"/^libdir=/s,.*,libdir=${STAGING_DIR_TARGET}${target_libdir},g\" -e \"/^dependency_libs=/s,\([[:space:]']\)-L${STAGING_LIBDIR_NATIVE},,g\""
+SYSROOTEXTRALIBDIRSED_OLD = " -e \"/^libdir=/s,.*,libdir=${target_libdir},g\" -e \"/^dependency_libs=/s,\([[:space:]']\)-L${STAGING_LIBDIR_NATIVE},,g\""
 
 SYSROOTEXTRALIBDIRSED = "${@["${SYSROOTEXTRALIBDIRSED_OLD}",""][("${LIBTOOL_HAS_SYSROOT}" == "yes")]}"
-- 
cgit 1.2.3-korg