Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Samuel Martin <s.martin49@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/4] package/opencv: fix build failure
Date: Wed,  1 Nov 2017 21:11:35 +0100	[thread overview]
Message-ID: <20171101201137.29939-2-s.martin49@gmail.com> (raw)
In-Reply-To: <20171101201137.29939-1-s.martin49@gmail.com>

Backport fix from upstream.

Fixes:
  http://autobuild.buildroot.net/results/b27d324331f6e351e95dd4742f4d0a50af60c590
  http://autobuild.buildroot.net/results/44ed0be0bd94028b7b37e7bf21233adc1753d94b

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 .../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
+
+From 126de0cd95418811e302996161e03195bf7e631a Mon Sep 17 00:00:00 2001
+From: neok-m4700 <neok-m4700@users.noreply.github.com>
+Date: Tue, 25 Jul 2017 10:25:20 +0200
+Subject: [PATCH] Update OpenCVCompilerOptions.cmake
+
+misplaced else
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ cmake/OpenCVCompilerOptions.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
+index 9b2a4e42e..7b079c5f9 100644
+--- a/cmake/OpenCVCompilerOptions.cmake
++++ b/cmake/OpenCVCompilerOptions.cmake
+@@ -18,9 +18,9 @@ if(ENABLE_CCACHE AND NOT CMAKE_COMPILER_IS_CCACHE)
+         message(STATUS "Unable to compile program with enabled ccache, reverting...")
+         set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${__OLD_RULE_LAUNCH_COMPILE}")
+       endif()
+-    else()
+-      message(STATUS "Looking for ccache - not found")
+     endif()
++  else()
++    message(STATUS "Looking for ccache - not found")
+   endif()
+ endif()
+ 
+-- 
+2.15.0
+
-- 
2.15.0

  reply	other threads:[~2017-11-01 20:11 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-01 20:11 [Buildroot] [PATCH 1/4] package/openobex: disable on Blackfin Samuel Martin
2017-11-01 20:11 ` Samuel Martin [this message]
2017-11-02 12:32   ` [Buildroot] [PATCH 2/4] package/opencv: fix build failure Thomas Petazzoni
2017-11-01 20:11 ` [Buildroot] [PATCH 3/4] package/opencv: add hashes for patch and license files Samuel Martin
2017-11-02 12:33   ` Thomas Petazzoni
2017-11-01 20:11 ` [Buildroot] [PATCH 4/4] package/ussp-push: removed deprecated/no longer needed deps on openobex-bluez Samuel Martin
2017-11-02 13:18   ` Thomas Petazzoni
2017-11-02 21:34   ` Thomas Petazzoni
2017-11-01 22:23 ` [Buildroot] [PATCH 1/4] package/openobex: disable on Blackfin Thomas Petazzoni
2017-11-02  2:14   ` Waldemar Brodkorb
2017-11-02  8:07     ` Thomas Petazzoni
2017-11-02  8:01   ` Samuel Martin
2017-11-02 10:38     ` Thomas Petazzoni
2017-11-02 10:42       ` Samuel Martin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171101201137.29939-2-s.martin49@gmail.com \
    --to=s.martin49@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox