• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/gnuradio/0001-suppress-boost_unitest-detection.patch
Bernd KuhlsBernd Kuhls committed bf56a2e5e8a05 Mar 2016
Raw file
Source viewDiff to previous
 
1
By default, the boost test option is mandatory for build environment
2
detection. 
3
This patch suppress this dependency and allows the test part only if
4
build_test is enabled at the Buildroot level.
5
​
6
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
7
---
8
Index: gnuradio-3.7.5/volk/cmake/VolkBoost.cmake
9
===================================================================
10
--- gnuradio-3.7.5.orig/volk/cmake/Modules/VolkBoost.cmake
11
+++ gnuradio-3.7.5/volk/cmake/Modules/VolkBoost.cmake
12
@@ -29,7 +29,6 @@ set(__INCLUDED_VOLK_BOOST_CMAKE TRUE)
13
 set(BOOST_REQUIRED_COMPONENTS
14
     filesystem
15
     system
16
-    unit_test_framework
17
     program_options
18
 )
19
 
20
Index: gnuradio-3.7.5/volk/lib/CMakeLists.txt
21
===================================================================
22
--- gnuradio-3.7.5.orig/volk/lib/CMakeLists.txt
23
+++ gnuradio-3.7.5/volk/lib/CMakeLists.txt
24
@@ -580,7 +580,10 @@
25
 ########################################################################
26
 # Build the QA test application
27
 ########################################################################
28
-if(ENABLE_TESTING)
29
+
30
+find_package(Boost "1.35" COMPONENTS "unit_test_framework")
31
+
32
+if(ENABLE_TESTING AND BUILD_TEST)
33
 
34
     #include Boost headers
35
     include_directories(${Boost_INCLUDE_DIRS})
36
@@ -597,4 +600,4 @@
37
         TARGET_DEPS volk
38
     )
39
 
40
-endif(ENABLE_TESTING)
41
+endif(ENABLE_TESTING AND BUILD_TEST)
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.