Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From d090638ff983e509162d5e3b62aa4918de4aa5fa Mon Sep 17 00:00:00 2001 |
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
| 3 | Date: Tue, 24 Apr 2012 16:24:35 +0200 |
| 4 | Subject: [PATCH 2/4] SConstruct: remove rpath |
| 5 | |
| 6 | * even with correct prefix (without DESTDIR) included it's redundant |
| 7 | WARNING: QA Issue: libgps: |
| 8 | /work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0 |
| 9 | contains probably-redundant RPATH /usr/lib |
| 10 | * and with prefix from scons.bbclass it's invalid |
| 11 | WARNING: QA Issue: package libgps contains bad RPATH |
| 12 | /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/image/usr/lib |
| 13 | in file |
| 14 | /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0 |
| 15 | |
| 16 | Upstream-Status: Inapppropriate [embedded specific] |
| 17 | |
| 18 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 19 | Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> |
| 20 | Signed-off-by: Peter A. Bigot <pab@pabigot.com> |
| 21 | --- |
| 22 | SConstruct | 7 +++++-- |
| 23 | 1 file changed, 5 insertions(+), 2 deletions(-) |
| 24 | |
| 25 | diff --git a/SConstruct b/SConstruct |
| 26 | index f0cafa8..ff46713 100644 |
| 27 | --- a/SConstruct |
| 28 | +++ b/SConstruct |
| 29 | @@ -1340,8 +1340,11 @@ if qt_env: |
| 30 | binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib)) |
| 31 | |
| 32 | if env["shared"] and env["chrpath"]: |
| 33 | - env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \ |
| 34 | - % (installdir('libdir', False), )) |
| 35 | + if not env['sysroot']: |
| 36 | + env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \ |
| 37 | + % (installdir('libdir', False), )) |
| 38 | + else: |
| 39 | + env.AddPostAction(binaryinstall, '$CHRPATH -d "$TARGET"') |
| 40 | |
| 41 | if not env['debug'] and not env['profiling'] and env['strip']: |
| 42 | env.AddPostAction(binaryinstall, '$STRIP $TARGET') |
| 43 | -- |
| 44 | 1.8.5.5 |
| 45 | |