diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2021-05-20 00:09:48 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2021-05-20 00:18:50 +0900 |
| commit | 86176cf37105bf3be3d65377ab7f7b40350a07f1 (patch) | |
| tree | 5dc0789c58ebce7369ae86b8f63859faa09b8a95 | |
| parent | 7bbb2e4ac5bb13083ac79833c1f430602d481712 (diff) | |
| download | extra-dependencies-86176cf37105bf3be3d65377ab7f7b40350a07f1.tar.gz extra-dependencies-86176cf37105bf3be3d65377ab7f7b40350a07f1.zip | |
DEB uncrustify: backported commit cb1a42dd from upstream. This allows to build using RelWithDebInfo.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
4 files changed, 22 insertions, 1 deletions
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/changelog b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/changelog index d6fe2c39..b61797af 100644 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/changelog +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/changelog @@ -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 diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/005_upstream_cb1a42dd.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/005_upstream_cb1a42dd.diff new file mode 100644 index 00000000..860d75be --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/005_upstream_cb1a42dd.diff @@ -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, diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/series b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/series index 383a9d11..2b804c34 100644 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/series +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/series @@ -2,3 +2,4 @@ 002_trinity_customization.diff 003_allow_older_distributions.diff 004_fixed_usage.diff +005_upstream_cb1a42dd.diff diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/rules b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/rules index 19d77a93..96f84e87 100755 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/rules +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/rules @@ -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" \ |