aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics/x11vnc
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2016-06-28 04:19:58 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2016-07-29 10:59:42 +0200
commitd209e32ffbcbbf419c3b5677777ac2e244bcebc1 (patch)
treee6aa00d91b8d1d8cfaaf885b2cee88c329598db8 /meta-oe/recipes-graphics/x11vnc
parente7aeb11f7c73b1e06983c82d867e0ce50a1f93e3 (diff)
downloadmeta-openembedded-contrib-d209e32ffbcbbf419c3b5677777ac2e244bcebc1.tar.gz
meta-openembedded-contrib-d209e32ffbcbbf419c3b5677777ac2e244bcebc1.tar.bz2
meta-openembedded-contrib-d209e32ffbcbbf419c3b5677777ac2e244bcebc1.zip
x11vnc: remove redundant RPATH to fix QA issue
The useless rpath caused oe QA issue: ... |ERROR: QA Issue: x11vnc: work/i586-poky-linux/x11vnc/0.9.13-r0/packages-split/ x11vnc/usr/bin/x11vnc contains probably-redundant RPATH /usr/lib [useless-rpaths] ... In oe build, it is unnecessary and redundant to pass "-R/usr/lib" to the linker. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics/x11vnc')
-rw-r--r--meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch86
-rw-r--r--meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb4
2 files changed, 89 insertions, 1 deletions
diff --git a/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch b/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch
new file mode 100644
index 0000000000..8e894bd8e7
--- /dev/null
+++ b/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch
@@ -0,0 +1,86 @@
+From 7be055c13c7d0d640941830a3291af3b404928c1 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Mon, 27 Jun 2016 04:44:14 -0400
+Subject: [PATCH] configure.ac: remove redundant RPATH
+
+It caused oe QA issue:
+...
+|ERROR: QA Issue: x11vnc: work/i586-poky-linux/x11vnc/0.9.13-r0/packages-split/
+x11vnc/usr/bin/x11vnc contains probably-redundant RPATH /usr/lib [useless-rpaths]
+...
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ configure.ac | 21 +++++----------------
+ 1 file changed, 5 insertions(+), 16 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6f664d0..f986686 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -330,10 +330,8 @@ if test "x$with_crypto" != "xno" -a "x$with_ssl" != "xno"; then
+ saved_LDFLAGS="$LDFLAGS"
+ CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
+ LDFLAGS="$LDFLAGS -L$with_ssl/lib"
+- if test "x$ld_minus_R" = "xno"; then
++ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then
+ :
+- elif test "x$GCC" = "xyes"; then
+- LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib"
+ else
+ LDFLAGS="$LDFLAGS -R$with_ssl/lib"
+ fi
+@@ -447,10 +445,8 @@ if test ! -z "$with_system_libvncserver" -a "x$with_system_libvncserver" != "xno
+ fi
+ if test "x$with_system_libvncserver" != "xyes"; then
+ rflag=""
+- if test "x$ld_minus_R" = "xno"; then
++ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then
+ :
+- elif test "x$GCC" = "xyes"; then
+- rflag="-Xlinker -R$with_system_libvncserver/lib"
+ else
+ rflag="-R$with_system_libvncserver/lib"
+ fi
+@@ -484,10 +480,8 @@ new enough.
+ elif libvncserver-config --version 1>/dev/null 2>&1; then
+ rflag=""
+ rprefix=`libvncserver-config --prefix`
+- if test "x$ld_minus_R" = "xno"; then
++ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then
+ :
+- elif test "x$GCC" = "xyes"; then
+- rflag=" -Xlinker -R$rprefix/lib "
+ else
+ rflag=" -R$rprefix/lib "
+ fi
+@@ -541,11 +535,8 @@ if test "x$with_jpeg" != "xno"; then
+ saved_LDFLAGS="$LDFLAGS"
+ CPPFLAGS="$CPPFLAGS -I$with_jpeg/include"
+ LDFLAGS="$LDFLAGS -L$with_jpeg/lib"
+- if test "x$ld_minus_R" = "xno"; then
++ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then
+ :
+- elif test "x$GCC" = "xyes"; then
+- # this is not complete... in general a rat's nest.
+- LDFLAGS="$LDFLAGS -Xlinker -R$with_jpeg/lib"
+ else
+ LDFLAGS="$LDFLAGS -R$with_jpeg/lib"
+ fi
+@@ -590,10 +581,8 @@ if test "x$with_zlib" != "xno" -a "x$with_libz" != "xno"; then
+ saved_LDFLAGS="$LDFLAGS"
+ CPPFLAGS="$CPPFLAGS -I$with_zlib/include"
+ LDFLAGS="$LDFLAGS -L$with_zlib/lib"
+- if test "x$ld_minus_R" = "xno"; then
++ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then
+ :
+- elif test "x$GCC" = "xyes"; then
+- LDFLAGS="$LDFLAGS -Xlinker -R$with_zlib/lib"
+ else
+ LDFLAGS="$LDFLAGS -R$with_zlib/lib"
+ fi
+--
+2.8.1
+
diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
index 64c8a5d5d2..98a0734bdc 100644
--- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
+++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
@@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\
file://starting-fix.patch \
- file://endian-fix.patch "
+ file://endian-fix.patch \
+ file://remove-redundant-RPATH.patch \
+"
SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c"
SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b"