|
| 1 | +From afb123618b087f3ca2305b84fb004624662e52f0 Mon Sep 17 00:00:00 2001 |
| 2 | +From: David Seifert < [email protected]> |
| 3 | +Date: Wed, 26 Feb 2020 11:07:29 +0100 |
| 4 | +Subject: Fix GCC 10 / -fno-common |
| 5 | + |
| 6 | +* GCC 10 switches its default symbol emission mode |
| 7 | + to cause linker errors when an object is defined |
| 8 | + more than once. |
| 9 | + |
| 10 | +Bug: https://bugs.gentoo.org/706756 |
| 11 | +Signed-off-by: David Seifert < [email protected]> |
| 12 | +Signed-off-by: Hans Verkuil < [email protected]> |
| 13 | +--- |
| 14 | + lib/include/libdvbv5/desc_t2_delivery.h | 2 +- |
| 15 | + lib/libdvbv5/dvb-v5.h | 26 +++++++++++++------------- |
| 16 | + 2 files changed, 14 insertions(+), 14 deletions(-) |
| 17 | + |
| 18 | +diff --git a/lib/include/libdvbv5/desc_t2_delivery.h b/lib/include/libdvbv5/desc_t2_delivery.h |
| 19 | +index 93594b76..8c11fa9a 100644 |
| 20 | +--- a/lib/include/libdvbv5/desc_t2_delivery.h |
| 21 | ++++ b/lib/include/libdvbv5/desc_t2_delivery.h |
| 22 | +@@ -215,7 +215,7 @@ extern const unsigned dvbt2_transmission_mode[]; |
| 23 | + * @brief converts from internal representation to string the SISO_MISO |
| 24 | + * field of dvb_desc_t2_delivery:SISO_MISO field. |
| 25 | + */ |
| 26 | +-const char *siso_miso[4]; |
| 27 | ++extern const char *siso_miso[4]; |
| 28 | + |
| 29 | + #ifdef __cplusplus |
| 30 | + } |
| 31 | +diff --git a/lib/libdvbv5/dvb-v5.h b/lib/libdvbv5/dvb-v5.h |
| 32 | +index 45aaddda..3540bac1 100644 |
| 33 | +--- a/lib/libdvbv5/dvb-v5.h |
| 34 | ++++ b/lib/libdvbv5/dvb-v5.h |
| 35 | +@@ -14,17 +14,17 @@ struct fe_status_name { |
| 36 | + char *name; |
| 37 | + }; |
| 38 | + extern struct fe_status_name fe_status_name[8]; |
| 39 | +-const char *fe_code_rate_name[14]; |
| 40 | +-const char *fe_modulation_name[15]; |
| 41 | +-const char *fe_transmission_mode_name[10]; |
| 42 | +-const unsigned fe_bandwidth_name[8]; |
| 43 | +-const char *fe_guard_interval_name[12]; |
| 44 | +-const char *fe_hierarchy_name[6]; |
| 45 | +-const char *fe_voltage_name[4]; |
| 46 | +-const char *fe_tone_name[3]; |
| 47 | +-const char *fe_inversion_name[4]; |
| 48 | +-const char *fe_pilot_name[4]; |
| 49 | +-const char *fe_rolloff_name[5]; |
| 50 | +-const char *dvb_v5_name[72]; |
| 51 | +-const char *delivery_system_name[20]; |
| 52 | ++extern const char *fe_code_rate_name[14]; |
| 53 | ++extern const char *fe_modulation_name[15]; |
| 54 | ++extern const char *fe_transmission_mode_name[10]; |
| 55 | ++extern const unsigned fe_bandwidth_name[8]; |
| 56 | ++extern const char *fe_guard_interval_name[12]; |
| 57 | ++extern const char *fe_hierarchy_name[6]; |
| 58 | ++extern const char *fe_voltage_name[4]; |
| 59 | ++extern const char *fe_tone_name[3]; |
| 60 | ++extern const char *fe_inversion_name[4]; |
| 61 | ++extern const char *fe_pilot_name[4]; |
| 62 | ++extern const char *fe_rolloff_name[5]; |
| 63 | ++extern const char *dvb_v5_name[72]; |
| 64 | ++extern const char *delivery_system_name[20]; |
| 65 | + #endif |
| 66 | +-- |
| 67 | +cgit v1.2.1 |
| 68 | + |
0 commit comments