From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Petazzoni Date: Thu, 2 Nov 2017 13:32:08 +0100 Subject: [Buildroot] [PATCH 2/4] package/opencv: fix build failure In-Reply-To: <20171101201137.29939-2-s.martin49@gmail.com> References: <20171101201137.29939-1-s.martin49@gmail.com> <20171101201137.29939-2-s.martin49@gmail.com> Message-ID: <20171102133208.5e7c16e0@windsurf> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net 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 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 > +Date: Tue, 25 Jul 2017 10:25:20 +0200 > +Subject: [PATCH] Update OpenCVCompilerOptions.cmake > + > +misplaced else ... here. > + > +Signed-off-by: Samuel Martin Applied with this change. Thanks! Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com