Skip to contentSkip to conversation

package/zxing-cpp: add optional cppunit dependency

PATCH New Fabrice Fontaine 2 participants 3 messages Nov 9, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/zxing-cpp: add optional cppunit dependency

zxing-cpp optionally depends on cppunit

There is no option to disable it until we bump the version to at least
https://github.com/glassechidna/zxing-cpp/commit/4e2b4fe1668c60d73e7649b0d3d5888912878392

---
 package/zxing-cpp/zxing-cpp.mk | 1 +
 1 file changed, 1 insertion(+)
package/zxing-cpp/zxing-cpp.mk +1 -0
index 7113ae2b06..4b46f2d29f 100644
@@ -10,6 +10,7 @@ ZXING_CPP_LICENSE = Apache-2.0
 ZXING_CPP_LICENSE_FILES = COPYING
 ZXING_CPP_INSTALL_STAGING = YES
 ZXING_CPP_SUPPORTS_IN_SOURCE_BUILD = NO
+ZXING_CPP_DEPENDENCIES = $(if $(BR2_PACKAGE_CPPUNIT),cppunit)
 
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
 ZXING_CPP_DEPENDENCIES += libiconv
Signature · 1 line
2.23.0
#1 lore raw

PATCH 2/2 package/zxing-cpp: fix build with cppunit and gcc 5

Fixes:
- http://autobuild.buildroot.org/results/8c675300aa7e7f2a5a2f0a2ac0f191b8d2ff8c42

---
 .../0001-Build-with-C-11-on-Unix.patch        | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/zxing-cpp/0001-Build-with-C-11-on-Unix.patch
package/zxing-cpp/0001-Build-with-C-11-on-Unix.patch new file +28 -0
new file mode 100644
index 0000000000..e975775d67
@@ -0,0 +1,28 @@
+From 14d0a7196993868e5fb5ef18afd03a2bf2ca8014 Mon Sep 17 00:00:00 2001
+From: Nick <[email protected]>
+Date: Wed, 20 Mar 2019 00:43:58 -0400
+Subject: [PATCH] Build with C++11 on Unix.
+
+This fixes the opencv wrapper code on Darwin; probably on other platforms too,
+though maybe they are less strict.
+
+[Retrieved (and backported) from:
+https://github.com/glassechidna/zxing-cpp/commit/14d0a7196993868e5fb5ef18afd03a2bf2ca8014]
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ccb2ba9..738f4e1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,6 +34,8 @@ include(source_files.cmake)
+     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+     add_definitions(/Za)
+ endif()
++
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+ # Add libzxing library.
+ file(GLOB_RECURSE LIBZXING_FILES
Signature · 1 line
2.23.0
#2 lore raw

PATCH 2/2 package/zxing-cpp: fix build with cppunit and gcc 5

Fabrice, All,

On 2019-11-09 09:37 +0100, Fabrice Fontaine spake thusly:

Quoted 2 lines

Fixes:
- http://autobuild.buildroot.org/results/8c675300aa7e7f2a5a2f0a2ac0f191b8d2ff8c42

This should be folded in the previous patch, as this is mostly the same
thing: adding the optional dependency on cppunit and fixing the build with cppunit.

Quoted 1 line

[--SNIP--]

package/zxing-cpp/0001-Build-with-C-11-on-Unix.patch line 25

Quoted 10 lines
package/zxing-cpp/0001-Build-with-C-11-on-Unix.patch new file +10 -0
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ccb2ba9..738f4e1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,6 +34,8 @@ include(source_files.cmake)
+     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+     add_definitions(/Za)
+ endif()
++
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

This hints that maybe a dependency on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 is now needed, no?

Regards,
Yann E. MORIN.

Quoted 9 lines

+ # Add libzxing library.
+ file(GLOB_RECURSE LIBZXING_FILES

Signature · 6 lines
2.23.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'