Bug#893674: eris: further symbol adjustments for gcc7+ppc64el+-O3

[Steve Langasek]

Package: eris
Version: 1.3.23-6
Severity: minor
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear maintainers,

The latest version of eris fails to build on ppc64el in Ubuntu, because
Ubuntu builds with -O3 by default on ppc64el, resulting in some symbols file
mismatches.

All of the added/removed symbols look safe to mark as optional, so I've
applied the attached patch in Ubuntu.  Please consider including it in
Debian as well.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
diff -Nru eris-1.3.23/debian/liberis-1.3-21.symbols eris-1.3.23/debian/liberis-1.3-21.symbols
--- eris-1.3.23/debian/liberis-1.3-21.symbols	2017-12-31 17:59:13.000000000 -0800
+++ eris-1.3.23/debian/liberis-1.3-21.symbols	2018-03-20 21:35:26.000000000 -0700
@@ -44,7 +44,9 @@
  _ZN4Eris10ServerInfoD1Ev at Base 1.3.19
  _ZN4Eris10ServerInfoD2Ev at Base 1.3.19
  _ZN4Eris10SpawnPointC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKSt6vectorINS_13CharacterTypeESaISA_EES8_ at Base 1.3.23
+ (optional)_ZN4Eris10SpawnPointC1ERKS0_ at Base 1.3.19
  _ZN4Eris10SpawnPointC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKSt6vectorINS_13CharacterTypeESaISA_EES8_ at Base 1.3.23
+ (optional)_ZN4Eris10SpawnPointC2ERKS0_ at Base 1.3.19
  _ZN4Eris10SpawnPointD1Ev at Base 1.3.19
  _ZN4Eris10SpawnPointD2Ev at Base 1.3.19
  _ZN4Eris10ViewEntity11onTaskAddedEPNS_4TaskE at Base 1.3.19
@@ -776,7 +778,7 @@
  (optional=GCC7_removed)_ZNSt6vectorIdSaIdEE19_M_emplace_back_auxIJdEEEvDpOT_ at Base 1.3.23
  (optional=GCC7_added)_ZNSt6vectorIdSaIdEE17_M_realloc_insertIJdEEEvN9__gnu_cxx17__normal_iteratorIPdS1_EEDpOT_ at Base 1.3.23-6~
  _ZNSt6vectorIdSaIdEEaSERKS1_ at Base 1.3.19
- _ZNSt7__cxx1110_List_baseIN4sigc9slot_baseESaIS2_EE8_M_clearEv at Base 1.3.23
+ (optional)_ZNSt7__cxx1110_List_baseIN4sigc9slot_baseESaIS2_EE8_M_clearEv at Base 1.3.23
  _ZNSt7__cxx1110_List_baseINS_12basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE8_M_clearEv at Base 1.3.23
  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev at Base 1.3.23
  _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev at Base 1.3.23
@@ -861,7 +863,7 @@
  (optional=certain_64b_arches)_ZNSt8_Rb_treeIPN4Eris8TypeInfoES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS2_ERKS2_ at Base 1.3.21
  _ZNSt8_Rb_treeIPN4Eris8TypeInfoES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE7_M_copyINS8_11_Alloc_nodeEEEPSt13_Rb_tree_nodeIS2_EPKSC_PSt18_Rb_tree_node_baseRT_ at Base 1.3.23
  _ZNSt8_Rb_treeIPN4Eris8TypeInfoES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E at Base 1.3.19
- _ZNSt8_Rb_treeIPN4Eris9MetaQueryES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE16_M_insert_uniqueIRKS2_EESt4pairISt17_Rb_tree_iteratorIS2_EbEOT_ at Base 1.3.23
+ (optional)_ZNSt8_Rb_treeIPN4Eris9MetaQueryES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE16_M_insert_uniqueIRKS2_EESt4pairISt17_Rb_tree_iteratorIS2_EbEOT_ at Base 1.3.23
  _ZNSt8_Rb_treeIPN4Eris9MetaQueryES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E at Base 1.3.19
  (optional=inline)_ZNSt8_Rb_treeIiSt4pairIKiPN4Eris12ResponseBaseEESt10_Select1stIS5_ESt4lessIiESaIS5_EE24_M_get_insert_unique_posERS1_ at Base 1.3.21
  (optional=certain_64b_arches)_ZNSt8_Rb_treeIiSt4pairIKiPN4Eris12ResponseBaseEESt10_Select1stIS5_ESt4lessIiESaIS5_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS5_ERS1_ at Base 1.3.21