[Buildroot] [PATCH 2/4] package/opencv: fix build failure

Thomas Petazzoni thomas.petazzoni at free-electrons.com
Thu Nov 2 12:32:08 UTC 2017


Hello,

On Wed,  1 Nov 2017 21:11:35 +0100, Samuel Martin wrote:
> Backport fix from upstream.
> 
> Fixes:
>   http://autobuild.buildroot.net/results/b27d324331f6e351e95dd4742f4d0a50af60c590
>   http://autobuild.buildroot.net/results/44ed0be0bd94028b7b37e7bf21233adc1753d94b
> 
> Signed-off-by: Samuel Martin <s.martin49 at gmail.com>

Applied, with one small change, see below.

> ---
>  .../0003-Update-OpenCVCompilerOptions.cmake.patch  | 33 ++++++++++++++++++++++
>  1 file changed, 33 insertions(+)
>  create mode 100644 package/opencv/0003-Update-OpenCVCompilerOptions.cmake.patch
> 
> diff --git a/package/opencv/0003-Update-OpenCVCompilerOptions.cmake.patch b/package/opencv/0003-Update-OpenCVCompilerOptions.cmake.patch
> new file mode 100644
> index 0000000000..290eef4d10
> --- /dev/null
> +++ b/package/opencv/0003-Update-OpenCVCompilerOptions.cmake.patch
> @@ -0,0 +1,33 @@
> +Fetch from upstream: https://github.com/opencv/opencv/commit/126de0cd95418811e302996161e03195bf7e631a

By putting this comment here, you break the possibility of applying the
patch with "git am", i.e the patch is no longer a proper Git formatted
patch. Therefore, such comments should go...

> +
> +From 126de0cd95418811e302996161e03195bf7e631a Mon Sep 17 00:00:00 2001
> +From: neok-m4700 <neok-m4700 at users.noreply.github.com>
> +Date: Tue, 25 Jul 2017 10:25:20 +0200
> +Subject: [PATCH] Update OpenCVCompilerOptions.cmake
> +
> +misplaced else

... here.

> +
> +Signed-off-by: Samuel Martin <s.martin49 at gmail.com>

Applied with this change. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com



More information about the buildroot mailing list