mirror of
git://git.yoctoproject.org/poky
synced 2026-10-02 15:40:54 +00:00
27cb6b5543
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 923a55e5e3aaab7f11122751e1344b0d535569c0) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
From f59c5269f92d59a5296cbfeeb682d42095cd88ad Mon Sep 17 00:00:00 2001
|
|
From: Wenzong Fan <wenzong.fan@windriver.com>
|
|
Date: Thu, 18 Sep 2014 02:24:07 -0400
|
|
Subject: [PATCH] gstreamer1.0-plugins-bad: allow to disable libssh2
|
|
|
|
libssh2 is automatically linked to if present, this undetermined
|
|
dependency may cause build errors like:
|
|
|
|
.../x86_64-poky-linux/4.9.0/ld: cannot find -lssh2
|
|
|
|
libssh2 isn't an oe-core recipe, so allow to disable it from
|
|
configure.
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
|
|
---
|
|
configure.ac | 23 +++++++++++++++++------
|
|
1 file changed, 17 insertions(+), 6 deletions(-)
|
|
|
|
Index: gst-plugins-bad-1.12.3/configure.ac
|
|
===================================================================
|
|
--- gst-plugins-bad-1.12.3.orig/configure.ac
|
|
+++ gst-plugins-bad-1.12.3/configure.ac
|
|
@@ -2139,6 +2139,15 @@ AG_GST_CHECK_FEATURE(CHROMAPRINT, [chrom
|
|
])
|
|
|
|
dnl *** Curl ***
|
|
+AC_ARG_ENABLE([libssh2],
|
|
+ [ --enable-libssh2 enable LIBSSH2 support @<:@default=auto@:>@],
|
|
+ [case "${enableval}" in
|
|
+ yes) NEED_SSH2=yes ;;
|
|
+ no) NEED_SSH2=no ;;
|
|
+ auto) NEED_SSH2=auto ;;
|
|
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-libssh2]) ;;
|
|
+ esac],[NEED_SSH2=auto])
|
|
+
|
|
translit(dnm, m, l) AM_CONDITIONAL(USE_CURL, true)
|
|
AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [
|
|
PKG_CHECK_MODULES(CURL, libcurl >= 7.35.0, [
|
|
@@ -2161,12 +2170,14 @@ AG_GST_CHECK_FEATURE(CURL, [Curl plugin]
|
|
])
|
|
AC_SUBST(CURL_CFLAGS)
|
|
AC_SUBST(CURL_LIBS)
|
|
- PKG_CHECK_MODULES(SSH2, libssh2 >= 1.4.3, [
|
|
- HAVE_SSH2="yes"
|
|
- AC_DEFINE(HAVE_SSH2, 1, [Define if libssh2 is available])
|
|
- ], [
|
|
- HAVE_SSH2="no"
|
|
- ])
|
|
+ if test "x$NEED_SSH2" != "xno"; then
|
|
+ PKG_CHECK_MODULES(SSH2, libssh2 >= 1.4.3, [
|
|
+ HAVE_SSH2="yes"
|
|
+ AC_DEFINE(HAVE_SSH2, 1, [Define if libssh2 is available])
|
|
+ ], [
|
|
+ HAVE_SSH2="no"
|
|
+ ])
|
|
+ fi
|
|
AM_CONDITIONAL(USE_SSH2, test "x$HAVE_SSH2" = "xyes")
|
|
AC_SUBST(SSH2_CFLAGS)
|
|
AC_SUBST(SSH2_LIBS)
|