[oe-commits] [meta-openembedded] 12/60: x11vnc: remove old libtool macros from acinclude.m4

[git at git.openembedded.org]

martin_jansa pushed a commit to branch krogoth-next
in repository meta-openembedded.

commit eefd95829c3dfb77d264a2ee51fec36959e2d2b0
Author: Christopher Larson <chris_larson at mentor.com>
AuthorDate: Tue May 17 09:10:20 2016 -0700

    x11vnc: remove old libtool macros from acinclude.m4
    
    These can cause build problems. We only want macros in acinclude.m4 which
    aren't available for aclocal to get elsewhere.
    
    Signed-off-by: Christopher Larson <chris_larson at mentor.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    (cherry picked from commit f6db87726d84976275cfe6b74a9e270f6bf6792e)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 6 ++++++
 1 file changed, 6 insertions(+)

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 7e92965..64c8a5d 100644
--- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
+++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
@@ -24,3 +24,9 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi',
 PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
 PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama"
 PACKAGECONFIG[libvncserver] = "--with-system-libvncserver,--without-system-libvncserver,libvncserver"
+
+do_prepare_sources () {
+    # Remove old libtool macros from acinclude.m4
+    sed -i -e '/^# libtool.m4/q' acinclude.m4
+}
+do_patch[postfuncs] += "do_prepare_sources"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.