DEB uncrustify: backported commit cb1a42dd from upstream. This allows to build using RelWithDebInfo.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/4/head
Michele Calgaro 4 years ago
parent 7bbb2e4ac5
commit 86176cf371

@ -1,3 +1,9 @@
uncrustify-trinity (0.73.0-0debian11.0.0+1) unstable; urgency=medium
* Backported commits cb1a42dd from upstream.
-- Michele Calgaro <michele.calgaro@yahoo.it> Wed, 19 May 2021 15:58:50 +0900
uncrustify-trinity (0.73.0-0debian11.0.0+0) unstable; urgency=medium
* TDE version of upstream 0.73.0

@ -0,0 +1,14 @@
Backported commit cb1a42dd from upstream git repository. This fixes FTBFS when building with RelWithDebInfo.
--- a/tests/cli/test_cli_options.py
+++ b/tests/cli/test_cli_options.py
@@ -705,8 +705,8 @@
#
# Test --tracking_space FILE
#
- if parsed_args.config == 'Release':
- eprint("Release")
+ if parsed_args.config == 'Release' or parsed_args.config == 'RelWithDebInfo':
+ eprint(parsed_args.config)
if not check_uncrustify_output(
uncr_bin,
parsed_args,

@ -2,3 +2,4 @@
002_trinity_customization.diff
003_allow_older_distributions.diff
004_fixed_usage.diff
005_upstream_cb1a42dd.diff

@ -6,7 +6,7 @@ include debian/cdbs/debian-tde.mk
DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_VERBOSE_MAKEFILE="ON" \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_TESTING="ON" \

Loading…
Cancel
Save