Commit 71a110fb authored by Andreas Tille's avatar Andreas Tille
Browse files

Fix build by filtering out items from list that are None

parent ccccc89e

debian/changelog

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ consensuscore (1.1.1+dfsg-2) UNRELEASED; urgency=medium 
  * Add myself to Uploaders

  * debhelper-compat 12

  * Standards-Version: 4.4.1

  TODO: Does not build



 -- Andreas Tille <tille@debian.org>  Sat, 07 Dec 2019 12:44:55 +0100

debian/patches/check_boost_version.patch

0 → 100644
+22 −0
Original line number Diff line number Diff line 
Description: Filter out items from list that are None

Bug-Debian: https://bugs.debian.org/936328

Author: Andreas Tille <tille@debian.org>

Last-Update: Sat, 07 Dec 2019 12:44:55 +0100



--- a/tools/find_boost

+++ b/tools/find_boost

@@ -38,8 +38,12 @@ def find_boost():

         glob("/opt/local/include/boost/")  + \

         glob("/opt/local/include/boost*/")

 

-    boosts_found = [ (boost, boost_version(boost))

-                     for boost in boost_candidates ]

+    boosts_found_all = [ (boost, boost_version(boost))

+                         for boost in boost_candidates ]

+    boosts_found = []

+    for bf in boosts_found_all:

+        if not bf[1] == None:

+            boosts_found.append(bf)

     if boosts_found:

         best_boost = max(boosts_found, key=lambda t: t[1])[0]

         return best_boost

debian/patches/series

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ spelling.patch 
compiler-flags.patch

gcc-6.patch

2to3.patch

check_boost_version.patch