[med-svn] [Git][med-team/spdlog][master] Add changes for Michael's Upload for version 1:1.8.5+ds-2

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / spdlog


Commits:
2b2c23ec by Nilesh Patra at 2021-08-28T00:59:14+05:30
Add changes for Michael's Upload for version 1:1.8.5+ds-2

- - - - -


4 changed files:

- debian/changelog
- debian/patches/autopkgtest
- debian/patches/use-external-fmt.patch
- debian/tests/run-tests


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+spdlog (1:1.8.5+ds-2) unstable; urgency=medium
+
+  * Fix autopkgtests by tweaking our patch and matching compilation flags
+    better. (Closes: #992977)
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Thu, 26 Aug 2021 13:20:09 +0200
+
 spdlog (1:1.8.5+ds-1) unstable; urgency=medium
 
   * Team upload


=====================================
debian/patches/autopkgtest
=====================================
@@ -1,5 +1,6 @@
-From: Michael R. Crusoe <michael.crusoe at gmail.com>
+From: Michael R. Crusoe <crusoe at debian.org>
 Subject: Enable running the tests against an installed copy of spdlog
+Forwarded: not-needed
 --- a/example/CMakeLists.txt
 +++ b/example/CMakeLists.txt
 @@ -3,6 +3,8 @@


=====================================
debian/patches/use-external-fmt.patch
=====================================
@@ -1,9 +1,10 @@
 Author: Nilesh Patra <npatra974 at gmail.com>
 Description: Use external libfmt by default
 Last-Changed: Sun, May, 14 2020
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -75,7 +75,7 @@ option(SPDLOG_BUILD_WARNINGS "Enable com
+Forwarded: not-needed
+--- spdlog.orig/CMakeLists.txt
++++ spdlog/CMakeLists.txt
+@@ -80,7 +80,7 @@
  
  # install options
  option(SPDLOG_INSTALL "Generate the install target" ${SPDLOG_MASTER_PROJECT})
@@ -12,19 +13,19 @@ Last-Changed: Sun, May, 14 2020
  option(SPDLOG_FMT_EXTERNAL_HO "Use external fmt header-only library instead of bundled" OFF)
  option(SPDLOG_NO_EXCEPTIONS "Compile with -fno-exceptions. Call abort() on any spdlog exceptions" OFF)
  
---- a/include/spdlog/tweakme.h
-+++ b/include/spdlog/tweakme.h
-@@ -63,7 +63,7 @@
+--- spdlog.orig/include/spdlog/tweakme.h
++++ spdlog/include/spdlog/tweakme.h
+@@ -71,7 +71,7 @@
  // In this case spdlog will try to include <fmt/format.h> so set your -I flag
  // accordingly.
  //
 -// #define SPDLOG_FMT_EXTERNAL
-+#define SPDLOG_FMT_EXTERNAL /usr/include/fmt
++#define SPDLOG_FMT_EXTERNAL 1
  ///////////////////////////////////////////////////////////////////////////////
  
  ///////////////////////////////////////////////////////////////////////////////
---- a/include/spdlog/fmt/bin_to_hex.h
-+++ b/include/spdlog/fmt/bin_to_hex.h
+--- spdlog.orig/include/spdlog/fmt/bin_to_hex.h
++++ spdlog/include/spdlog/fmt/bin_to_hex.h
 @@ -5,6 +5,7 @@
  
  #pragma once
@@ -33,8 +34,8 @@ Last-Changed: Sun, May, 14 2020
  #include <cctype>
  
  //
---- a/include/spdlog/fmt/fmt.h
-+++ b/include/spdlog/fmt/fmt.h
+--- spdlog.orig/include/spdlog/fmt/fmt.h
++++ spdlog/include/spdlog/fmt/fmt.h
 @@ -4,7 +4,7 @@
  //
  
@@ -51,8 +52,8 @@ Last-Changed: Sun, May, 14 2020
 -#endif
 \ No newline at end of file
 +#endif
---- a/include/spdlog/fmt/ostr.h
-+++ b/include/spdlog/fmt/ostr.h
+--- spdlog.orig/include/spdlog/fmt/ostr.h
++++ spdlog/include/spdlog/fmt/ostr.h
 @@ -7,7 +7,7 @@
  //
  // include bundled or external copy of fmtlib's ostream support
@@ -62,8 +63,8 @@ Last-Changed: Sun, May, 14 2020
  #if !defined(SPDLOG_FMT_EXTERNAL)
  #ifdef SPDLOG_HEADER_ONLY
  #ifndef FMT_HEADER_ONLY
---- a/src/fmt.cpp
-+++ b/src/fmt.cpp
+--- spdlog.orig/src/fmt.cpp
++++ spdlog/src/fmt.cpp
 @@ -6,6 +6,7 @@
  #error Please define SPDLOG_COMPILED_LIB to compile this file.
  #endif


=====================================
debian/tests/run-tests
=====================================
@@ -10,15 +10,17 @@ if [ "$AUTOPKGTEST_TMP" = "" ] ; then
 fi
 cd $AUTOPKGTEST_TMP
 
+export CFLAGS=-O2
+export CXXFLAGS=-O2
 cp -r /usr/share/doc/libspdlog-dev/tests/ .
 cp -r /usr/share/doc/libspdlog-dev/examples/example/ .
 mkdir cmake example_build
 cp /usr/share/doc/libspdlog-dev/utils.cmake cmake/
 cd tests
 for file in *.gz; do gunzip ${file}; done
-cmake -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_TESTS_HO=ON .
+cmake -DSPDLOG_BUILD_TESTS=ON -DSPDLOG_BUILD_TESTS_HO=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .
 make -j$(nproc) spdlog-utests-ho spdlog-utests
-CTEST_PARALLEL_LEVEL=1 ctest -j1
+CTEST_PARALLEL_LEVEL=1 ctest -j1 --force-new-ctest-process
 cd ../example_build
 cmake -DCMAKE_BUILD_TYPE=Release ../example
 make



View it on GitLab: https://salsa.debian.org/med-team/spdlog/-/commit/2b2c23ec1029dffc20402e88f74793668f787f1d

-- 
View it on GitLab: https://salsa.debian.org/med-team/spdlog/-/commit/2b2c23ec1029dffc20402e88f74793668f787f1d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210827/aa1a826b/attachment-0001.htm>