| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame] | 1 | From 7be055c13c7d0d640941830a3291af3b404928c1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Mon, 27 Jun 2016 04:44:14 -0400 |
| 4 | Subject: [PATCH] configure.ac: remove redundant RPATH |
| 5 | |
| 6 | It caused oe QA issue: |
| 7 | ... |
| 8 | |ERROR: QA Issue: x11vnc: work/i586-poky-linux/x11vnc/0.9.13-r0/packages-split/ |
| 9 | x11vnc/usr/bin/x11vnc contains probably-redundant RPATH /usr/lib [useless-rpaths] |
| 10 | ... |
| 11 | |
| 12 | Upstream-Status: Inappropriate [oe specific] |
| 13 | |
| 14 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 15 | --- |
| 16 | configure.ac | 21 +++++---------------- |
| 17 | 1 file changed, 5 insertions(+), 16 deletions(-) |
| 18 | |
| 19 | diff --git a/configure.ac b/configure.ac |
| 20 | index 6f664d0..f986686 100644 |
| 21 | --- a/configure.ac |
| 22 | +++ b/configure.ac |
| 23 | @@ -330,10 +330,8 @@ if test "x$with_crypto" != "xno" -a "x$with_ssl" != "xno"; then |
| 24 | saved_LDFLAGS="$LDFLAGS" |
| 25 | CPPFLAGS="$CPPFLAGS -I$with_ssl/include" |
| 26 | LDFLAGS="$LDFLAGS -L$with_ssl/lib" |
| 27 | - if test "x$ld_minus_R" = "xno"; then |
| 28 | + if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then |
| 29 | : |
| 30 | - elif test "x$GCC" = "xyes"; then |
| 31 | - LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib" |
| 32 | else |
| 33 | LDFLAGS="$LDFLAGS -R$with_ssl/lib" |
| 34 | fi |
| 35 | @@ -447,10 +445,8 @@ if test ! -z "$with_system_libvncserver" -a "x$with_system_libvncserver" != "xno |
| 36 | fi |
| 37 | if test "x$with_system_libvncserver" != "xyes"; then |
| 38 | rflag="" |
| 39 | - if test "x$ld_minus_R" = "xno"; then |
| 40 | + if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then |
| 41 | : |
| 42 | - elif test "x$GCC" = "xyes"; then |
| 43 | - rflag="-Xlinker -R$with_system_libvncserver/lib" |
| 44 | else |
| 45 | rflag="-R$with_system_libvncserver/lib" |
| 46 | fi |
| 47 | @@ -484,10 +480,8 @@ new enough. |
| 48 | elif libvncserver-config --version 1>/dev/null 2>&1; then |
| 49 | rflag="" |
| 50 | rprefix=`libvncserver-config --prefix` |
| 51 | - if test "x$ld_minus_R" = "xno"; then |
| 52 | + if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then |
| 53 | : |
| 54 | - elif test "x$GCC" = "xyes"; then |
| 55 | - rflag=" -Xlinker -R$rprefix/lib " |
| 56 | else |
| 57 | rflag=" -R$rprefix/lib " |
| 58 | fi |
| 59 | @@ -541,11 +535,8 @@ if test "x$with_jpeg" != "xno"; then |
| 60 | saved_LDFLAGS="$LDFLAGS" |
| 61 | CPPFLAGS="$CPPFLAGS -I$with_jpeg/include" |
| 62 | LDFLAGS="$LDFLAGS -L$with_jpeg/lib" |
| 63 | - if test "x$ld_minus_R" = "xno"; then |
| 64 | + if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then |
| 65 | : |
| 66 | - elif test "x$GCC" = "xyes"; then |
| 67 | - # this is not complete... in general a rat's nest. |
| 68 | - LDFLAGS="$LDFLAGS -Xlinker -R$with_jpeg/lib" |
| 69 | else |
| 70 | LDFLAGS="$LDFLAGS -R$with_jpeg/lib" |
| 71 | fi |
| 72 | @@ -590,10 +581,8 @@ if test "x$with_zlib" != "xno" -a "x$with_libz" != "xno"; then |
| 73 | saved_LDFLAGS="$LDFLAGS" |
| 74 | CPPFLAGS="$CPPFLAGS -I$with_zlib/include" |
| 75 | LDFLAGS="$LDFLAGS -L$with_zlib/lib" |
| 76 | - if test "x$ld_minus_R" = "xno"; then |
| 77 | + if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then |
| 78 | : |
| 79 | - elif test "x$GCC" = "xyes"; then |
| 80 | - LDFLAGS="$LDFLAGS -Xlinker -R$with_zlib/lib" |
| 81 | else |
| 82 | LDFLAGS="$LDFLAGS -R$with_zlib/lib" |
| 83 | fi |
| 84 | -- |
| 85 | 2.8.1 |
| 86 | |