Control: tag -1 + patch

Hi,

On Wed, 26 Feb 2020 17:09:48 +0100 Lucas Nussbaum <lu...@debian.org> *wrote:
> Source: hinge
> Version: 0.5.0-5
> Severity: serious
> Justification: FTBFS on amd64
> Tags: bullseye sid ftbfs
> Usertags: ftbfs-20200225 ftbfs-bullseye
> 
> Hi,
> 
> During a rebuild of all packages in sid, your package failed to build on
> amd64.
> 
> This rebuild was done by building only architecture:any binary packages
> (binary-arch target of debian/rules).
> 
> Relevant part (hopefully):
> > cd /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/bin/maximal && /usr/bin/c++   
> > -I/<<PKGBUILDDIR>>/src/include  -g -O2 
> > -fdebug-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat 
> > -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2  -std=gnu++11 
> > -fopenmp   -o CMakeFiles/get_maximal_reads.dir/maximal.cpp.o -c 
> > /<<PKGBUILDDIR>>/src/maximal/maximal.cpp
> > In file included from /usr/include/spdlog/common.h:38,
> >                  from /usr/include/spdlog/spdlog.h:12,
> >                  from /<<PKGBUILDDIR>>/src/consensus/draft.cpp:14:
> > /usr/include/spdlog/fmt/fmt.h:22:10: fatal error: 
> > spdlog/fmt/bundled/core.h: No such file or directory
> >    22 | #include <spdlog/fmt/bundled/core.h>
> >       |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> > compilation terminated.
> > make[3]: *** [bin/consensus/CMakeFiles/draft_assembly.dir/build.make:66: 
> > bin/consensus/CMakeFiles/draft_assembly.dir/draft.cpp.o] Error 1

Patch proposal attached.

Thanks,

_g.
diff -Nru hinge-0.5.0/debian/changelog hinge-0.5.0/debian/changelog
--- hinge-0.5.0/debian/changelog        2019-12-06 16:12:32.000000000 +0100
+++ hinge-0.5.0/debian/changelog        2020-03-19 17:07:48.000000000 +0100
@@ -1,3 +1,10 @@
+hinge (0.5.0-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS against spdlog 1.5.0 (closes: #952615)
+
+ -- Gilles Filippini <p...@debian.org>  Thu, 19 Mar 2020 17:07:48 +0100
+
 hinge (0.5.0-5) unstable; urgency=medium
 
   * Afif removed himself from Uploaders
diff -Nru hinge-0.5.0/debian/patches/series hinge-0.5.0/debian/patches/series
--- hinge-0.5.0/debian/patches/series   2019-12-06 16:12:32.000000000 +0100
+++ hinge-0.5.0/debian/patches/series   2020-03-19 17:07:48.000000000 +0100
@@ -2,3 +2,4 @@
 libspdlog-14.0.patch
 libspdlog-1:1.3.0
 2to3.patch
+spdlog-1.5.0.patch
diff -Nru hinge-0.5.0/debian/patches/spdlog-1.5.0.patch 
hinge-0.5.0/debian/patches/spdlog-1.5.0.patch
--- hinge-0.5.0/debian/patches/spdlog-1.5.0.patch       1970-01-01 
01:00:00.000000000 +0100
+++ hinge-0.5.0/debian/patches/spdlog-1.5.0.patch       2020-03-19 
17:07:48.000000000 +0100
@@ -0,0 +1,57 @@
+Index: hinge-0.5.0/src/consensus/CMakeLists.txt
+===================================================================
+--- hinge-0.5.0.orig/src/consensus/CMakeLists.txt
++++ hinge-0.5.0/src/consensus/CMakeLists.txt
+@@ -1,9 +1,10 @@
+ cmake_minimum_required(VERSION 3.2)
+ 
++add_definitions(-DSPDLOG_FMT_EXTERNAL)
+ add_executable(draft_assembly draft)
+-target_link_libraries(draft_assembly LAInterface ini falcon )
++target_link_libraries(draft_assembly fmt LAInterface ini falcon )
+ 
+ add_executable(consensus consensus.cpp)
+-target_link_libraries(consensus LAInterface falcon ini)
++target_link_libraries(consensus fmt LAInterface falcon ini)
+ 
+ install(TARGETS draft_assembly consensus DESTINATION ${libexec})
+Index: hinge-0.5.0/src/filter/CMakeLists.txt
+===================================================================
+--- hinge-0.5.0.orig/src/filter/CMakeLists.txt
++++ hinge-0.5.0/src/filter/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ cmake_minimum_required(VERSION 3.2)
+ 
++add_definitions(-DSPDLOG_FMT_EXTERNAL)
+ add_executable(Reads_filter filter)
+-target_link_libraries(Reads_filter LAInterface ini )
++target_link_libraries(Reads_filter fmt LAInterface ini )
+ 
+ install(TARGETS Reads_filter DESTINATION ${libexec})
+Index: hinge-0.5.0/src/layout/CMakeLists.txt
+===================================================================
+--- hinge-0.5.0.orig/src/layout/CMakeLists.txt
++++ hinge-0.5.0/src/layout/CMakeLists.txt
+@@ -5,7 +5,8 @@ set(Boost_USE_STATIC_LIBS   ON)
+ FIND_PACKAGE( Boost COMPONENTS graph REQUIRED )
+ INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
+ 
++add_definitions(-DSPDLOG_FMT_EXTERNAL)
+ add_executable(hinging hinging)
+-target_link_libraries(hinging LAInterface ini  ${Boost_LIBRARIES})
++target_link_libraries(hinging fmt LAInterface ini  ${Boost_LIBRARIES})
+ 
+ install(TARGETS hinging DESTINATION ${libexec})
+Index: hinge-0.5.0/src/maximal/CMakeLists.txt
+===================================================================
+--- hinge-0.5.0.orig/src/maximal/CMakeLists.txt
++++ hinge-0.5.0/src/maximal/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ cmake_minimum_required(VERSION 3.2)
+ 
++add_definitions(-DSPDLOG_FMT_EXTERNAL)
+ add_executable(get_maximal_reads maximal)
+-target_link_libraries(get_maximal_reads LAInterface ini )
++target_link_libraries(get_maximal_reads fmt LAInterface ini )
+ 
+ install(TARGETS get_maximal_reads DESTINATION ${libexec})

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to