Package: libsml Version: 0.1.1+git20180125-1 Followup-For: Bug #957478 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu hirsute ubuntu-patch Control: tags -1 patch
Hi, In Ubuntu, the attached patch was applied to achieve the following: * d/p/gcc-10.patch: Cherrypick upstream Git commit to fix FTBFS with GCC 10. Thanks for considering the patch. Logan
diff -Nru libsml-0.1.1+git20180125/debian/patches/gcc-10.patch libsml-0.1.1+git20180125/debian/patches/gcc-10.patch --- libsml-0.1.1+git20180125/debian/patches/gcc-10.patch 1969-12-31 19:00:00.000000000 -0500 +++ libsml-0.1.1+git20180125/debian/patches/gcc-10.patch 2021-01-16 20:21:25.000000000 -0500 @@ -0,0 +1,200 @@ +From 0738cd50632eadb9cd2c21e07b70f984a9cf444b Mon Sep 17 00:00:00 2001 +From: r00t <r...@constancy.org> +Date: Mon, 28 Dec 2020 01:03:43 +0100 +Subject: [PATCH] [test] fix building with -fno-common (gcc10 default), + +see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678 +--- + test/src/sml_boolean_test.c | 2 +- + test/src/sml_buffer_test.c | 2 +- + test/src/sml_file_test.c | 2 +- + test/src/sml_get_profile_pack_request_test.c | 2 +- + test/src/sml_list_test.c | 4 ++-- + test/src/sml_message_test.c | 2 +- + test/src/sml_number_test.c | 2 +- + test/src/sml_octet_string_test.c | 2 +- + test/src/sml_open_request_test.c | 2 +- + test/src/sml_status_test.c | 2 +- + test/src/sml_time_test.c | 2 +- + test/src/sml_tree_test.c | 2 +- + test/src/sml_value_test.c | 2 +- + 13 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/test/src/sml_boolean_test.c b/test/src/sml_boolean_test.c +index 90b5f3d..0fbebf1 100644 +--- a/test/src/sml_boolean_test.c ++++ b/test/src/sml_boolean_test.c +@@ -22,7 +22,7 @@ + + TEST_GROUP(sml_boolean); + +-sml_buffer *buf; ++static sml_buffer *buf; + + TEST_SETUP(sml_boolean) { + buf = sml_buffer_init(512); +diff --git a/test/src/sml_buffer_test.c b/test/src/sml_buffer_test.c +index bf8e714..45eacc2 100644 +--- a/test/src/sml_buffer_test.c ++++ b/test/src/sml_buffer_test.c +@@ -22,7 +22,7 @@ + TEST_GROUP(sml_buffer); + + int buffer_len = 512; +-sml_buffer *buf; ++static sml_buffer *buf; + + TEST_SETUP(sml_buffer) { + buf = sml_buffer_init(buffer_len); +diff --git a/test/src/sml_file_test.c b/test/src/sml_file_test.c +index 1b1bb15..9ded16f 100644 +--- a/test/src/sml_file_test.c ++++ b/test/src/sml_file_test.c +@@ -22,7 +22,7 @@ + + TEST_GROUP(sml_file); + +-sml_buffer *buf; ++static sml_buffer *buf; + + TEST_SETUP(sml_file) { + buf = sml_buffer_init(512); +diff --git a/test/src/sml_get_profile_pack_request_test.c b/test/src/sml_get_profile_pack_request_test.c +index c03d6ab..44f1f07 100644 +--- a/test/src/sml_get_profile_pack_request_test.c ++++ b/test/src/sml_get_profile_pack_request_test.c +@@ -22,7 +22,7 @@ + + TEST_GROUP(sml_get_profile_pack_request); + +-sml_buffer *buf; ++static sml_buffer *buf; + + TEST_SETUP(sml_get_profile_pack_request) { + buf = sml_buffer_init(512); +diff --git a/test/src/sml_list_test.c b/test/src/sml_list_test.c +index 9a5f583..56d6ed2 100644 +--- a/test/src/sml_list_test.c ++++ b/test/src/sml_list_test.c +@@ -22,7 +22,7 @@ + + TEST_GROUP(sml_list); + +-sml_buffer *buf; ++static sml_buffer *buf; + + TEST_SETUP(sml_list) { + buf = sml_buffer_init(512); +@@ -100,7 +100,7 @@ TEST_GROUP_RUNNER(sml_list) { + + TEST_GROUP(sml_sequence); + +-sml_buffer *buf; ++static sml_buffer *buf; + + TEST_SETUP(sml_sequence) { + buf = sml_buffer_init(512); +diff --git a/test/src/sml_message_test.c b/test/src/sml_message_test.c +index 7462435..3d4bb07 100644 +--- a/test/src/sml_message_test.c ++++ b/test/src/sml_message_test.c +@@ -22,7 +22,7 @@ + + TEST_GROUP(sml_message); + +-sml_buffer *buf; ++static sml_buffer *buf; + + TEST_SETUP(sml_message) { + buf = sml_buffer_init(512); +diff --git a/test/src/sml_number_test.c b/test/src/sml_number_test.c +index 9a5eece..09c00ca 100644 +--- a/test/src/sml_number_test.c ++++ b/test/src/sml_number_test.c +@@ -23,7 +23,7 @@ + + TEST_GROUP(sml_number); + +-sml_buffer *buf; ++static sml_buffer *buf; + + TEST_SETUP(sml_number) { + buf = sml_buffer_init(512); +diff --git a/test/src/sml_octet_string_test.c b/test/src/sml_octet_string_test.c +index 2a47632..c37d219 100644 +--- a/test/src/sml_octet_string_test.c ++++ b/test/src/sml_octet_string_test.c +@@ -22,7 +22,7 @@ + + TEST_GROUP(sml_octet_string); + +-sml_buffer *buf; ++static sml_buffer *buf; + + TEST_SETUP(sml_octet_string) { + buf = sml_buffer_init(512); +diff --git a/test/src/sml_open_request_test.c b/test/src/sml_open_request_test.c +index 89beba5..23b917f 100644 +--- a/test/src/sml_open_request_test.c ++++ b/test/src/sml_open_request_test.c +@@ -22,7 +22,7 @@ + + TEST_GROUP(sml_open_request); + +-sml_buffer *buf; ++static sml_buffer *buf; + + TEST_SETUP(sml_open_request) { + buf = sml_buffer_init(512); +diff --git a/test/src/sml_status_test.c b/test/src/sml_status_test.c +index 4724869..d63452e 100644 +--- a/test/src/sml_status_test.c ++++ b/test/src/sml_status_test.c +@@ -22,7 +22,7 @@ + + TEST_GROUP(sml_status); + +-sml_buffer *buf; ++static sml_buffer *buf; + + TEST_SETUP(sml_status) { + buf = sml_buffer_init(512); +diff --git a/test/src/sml_time_test.c b/test/src/sml_time_test.c +index c9e1220..861bfa2 100644 +--- a/test/src/sml_time_test.c ++++ b/test/src/sml_time_test.c +@@ -22,7 +22,7 @@ + + TEST_GROUP(sml_time); + +-sml_buffer *buf; ++static sml_buffer *buf; + + TEST_SETUP(sml_time) { + buf = sml_buffer_init(512); +diff --git a/test/src/sml_tree_test.c b/test/src/sml_tree_test.c +index 56357fc..84476ff 100644 +--- a/test/src/sml_tree_test.c ++++ b/test/src/sml_tree_test.c +@@ -23,7 +23,7 @@ + + TEST_GROUP(sml_tree); + +-sml_buffer *buf; ++static sml_buffer *buf; + + TEST_SETUP(sml_tree) { + buf = sml_buffer_init(512); +diff --git a/test/src/sml_value_test.c b/test/src/sml_value_test.c +index e29198f..595b57b 100644 +--- a/test/src/sml_value_test.c ++++ b/test/src/sml_value_test.c +@@ -22,7 +22,7 @@ + + TEST_GROUP(sml_value); + +-sml_buffer *buf; ++static sml_buffer *buf; + + TEST_SETUP(sml_value) { + buf = sml_buffer_init(512); diff -Nru libsml-0.1.1+git20180125/debian/patches/series libsml-0.1.1+git20180125/debian/patches/series --- libsml-0.1.1+git20180125/debian/patches/series 2018-05-13 04:27:20.000000000 -0400 +++ libsml-0.1.1+git20180125/debian/patches/series 2021-01-16 20:21:10.000000000 -0500 @@ -1 +1,2 @@ 0001-honor-buildflags.patch +gcc-10.patch
