Bug#894872: astyle: symbols adjustments to support build with -O3

2018-04-06 Thread Matteo Cypriani 
Hi Steve,

On Wed, 04 Apr 2018 21:54:49 -0700
Steve Langasek  wrote:
> While the 3.1-1 upload includes adjustments to the symbols files
> specifically for supporting builds with -O3, version 3.1-1 still
> fails to build in Ubuntu on ppc64el where the port is built with -O3
> by default.
> 
> Please find attached a patch which handles making all the necessary
> remaining template symbols 'optional'.

Thank you very much for the patch, I'll include it in the next upload.

  Matteo


pgphN_CbZAemd.pgp
Description: PGP signature

Bug#894872: astyle: symbols adjustments to support build with -O3

2018-04-04 Thread Steve Langasek 
Package: astyle
Followup-For: Bug #894872
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Sorry, looks like I missed one more symbol.  Revised patch attached.
diff -Nru astyle-3.1/debian/libastyle3.symbols 
astyle-3.1/debian/libastyle3.symbols
--- astyle-3.1/debian/libastyle3.symbols2018-03-18 06:07:06.0 
-0700
+++ astyle-3.1/debian/libastyle3.symbols2018-04-04 21:49:56.0 
-0700
@@ -526,12 +526,12 @@
  
(arch=armel)_ZNSt19_Sp_counted_deleterIPN6astyle12ASPeekStreamENSt12__shared_ptrIS1_LN9__gnu_cxx12_Lock_policyE1EE8_DeleterISaIS1_EEES8_LS5_1EED1Ev@Base
 3.0
  
(arch=armel)_ZNSt19_Sp_counted_deleterIPN6astyle12ASPeekStreamENSt12__shared_ptrIS1_LN9__gnu_cxx12_Lock_policyE1EE8_DeleterISaIS1_EEES8_LS5_1EED2Ev@Base
 3.0
  
(optional)_ZNSt6vectorIN6astyle10ASEnhancer15SwitchVariablesESaIS2_EE17_M_realloc_insertIJRS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base
 3.0
- 
_ZNSt6vectorIN6astyle9BraceTypeESaIS1_EE17_M_realloc_insertIJRS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base
 3.1
+ 
(optional)_ZNSt6vectorIN6astyle9BraceTypeESaIS1_EE17_M_realloc_insertIJRS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base
 3.1
  
_ZNSt6vectorIN6astyle9BraceTypeESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base
 3.0
  
_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJRS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base
 3.0
  
_ZNSt6vectorIPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EE12emplace_backIJRS7_EEEvDpOT_@Base
 3.0
  
_ZNSt6vectorIPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EE12emplace_backIJS7_EEEvDpOT_@Base
 0debian2.06
- 
_ZNSt6vectorIPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EE17_M_realloc_insertIJRS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base
 3.0
+ 
(optional)_ZNSt6vectorIPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EE17_M_realloc_insertIJRS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base
 3.0
  
(optional)_ZNSt6vectorIPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EE17_M_realloc_insertIJS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base
 3.0
  
(arch-bits=32)_ZNSt6vectorIPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EE7reserveEj@Base
 3.0
  
(arch-bits=64|optional)_ZNSt6vectorIPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EE7reserveEm@Base
 3.0
@@ -539,17 +539,18 @@
  
(optional)_ZNSt6vectorIPKSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES7_ESaISA_EE17_M_realloc_insertIJSA_EEEvN9__gnu_cxx17__normal_iteratorIPSA_SC_EEDpOT_@Base
 3.0
  
(optional)_ZNSt6vectorIPN6astyle12ASBeautifierESaIS2_EE12emplace_backIJRS2_EEEvDpOT_@Base
 3.0
  
(optional)_ZNSt6vectorIPN6astyle12ASBeautifierESaIS2_EE12emplace_backIJS2_EEEvDpOT_@Base
 3.0
- 
_ZNSt6vectorIPN6astyle12ASBeautifierESaIS2_EE17_M_realloc_insertIJRS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base
 3.0
- 
_ZNSt6vectorIPN6astyle12ASBeautifierESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base
 3.1
+ 
(optional)_ZNSt6vectorIPN6astyle12ASBeautifierESaIS2_EE17_M_realloc_insertIJRS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base
 3.0
+ 
(optional)_ZNSt6vectorIPN6astyle12ASBeautifierESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base
 3.1
  
(optional)_ZNSt6vectorIPS_IPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EESaISA_EE12emplace_backIJSA_EEEvDpOT_@Base
 0debian2.06
- 
_ZNSt6vectorIPS_IPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EESaISA_EE17_M_realloc_insertIJSA_EEEvN9__gnu_cxx17__normal_iteratorIPSA_SC_EEDpOT_@Base
 3.0
+ 
(optional)_ZNSt6vectorIPS_IPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EESaISA_EE17_M_realloc_insertIJSA_EEEvN9__gnu_cxx17__normal_iteratorIPSA_SC_EEDpOT_@Base
 3.0
  
(optional)_ZNSt6vectorISt4pairIiiESaIS1_EE17_M_realloc_insertIJRS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base
 3.0
+ (optional)_ZNSt6vectorISt4pairIiiESaIS1_EE12emplace_backIJRS1_EEEvDpOT_@Base 
3.1
  _ZNSt6vectorISt4pairIiiESaIS1_EEaSERKS3_@Base 0debian2.06
  _ZNSt6vectorIbSaIbEE13_M_insert_auxESt13_Bit_iteratorb@Base 0debian2.06
  _ZNSt6vectorIiSaIiEE12emplace_backIJRiEEEvDpOT_@Base 3.0
  _ZNSt6vectorIiSaIiEE12emplace_backIJiEEEvDpOT_@Base 0debian2.06
- 
_ZNSt6vectorIiSaIiEE17_M_realloc_insertIJRiEEEvN9__gnu_cxx17__normal_iteratorIPiS1_EEDpOT_@Base
 3.1
- 
_ZNSt6vectorIiSaIiEE17_M_realloc_insertIJiEEEvN9__gnu_cxx17__normal_iteratorIPiS1_EEDpOT_@Base
 3.0
+ 
(optional)_ZNSt6vectorIiSaIiEE17_M_realloc_insertIJRiEEEvN9__gnu_cxx17__normal_iteratorIPiS1_EEDpOT_@Base
 3.1
+ 
(optional)_ZNSt6vectorIiSaIiEE17_M_realloc_insertIJiEEEvN9__gnu_cxx17__normal_iteratorIPiS1_EEDpOT_@Base
 3.0
  _ZNSt6vectorIiSaIiEEaSERKS1_@Base 0debian2.06

Bug#894872: astyle: symbols adjustments to support build with -O3

2018-04-04 Thread Steve Langasek 
Package: astyle
Version: 3.1-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear maintainers,

While the 3.1-1 upload includes adjustments to the symbols files
specifically for supporting builds with -O3, version 3.1-1 still fails to
build in Ubuntu on ppc64el where the port is built with -O3 by default.

Please find attached a patch which handles making all the necessary
remaining template symbols 'optional'.

-- 
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 Developerhttp://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru astyle-3.1/debian/libastyle3.symbols 
astyle-3.1/debian/libastyle3.symbols
--- astyle-3.1/debian/libastyle3.symbols2018-03-18 06:07:06.0 
-0700
+++ astyle-3.1/debian/libastyle3.symbols2018-04-04 21:48:58.0 
-0700
@@ -526,12 +526,12 @@
  
(arch=armel)_ZNSt19_Sp_counted_deleterIPN6astyle12ASPeekStreamENSt12__shared_ptrIS1_LN9__gnu_cxx12_Lock_policyE1EE8_DeleterISaIS1_EEES8_LS5_1EED1Ev@Base
 3.0
  
(arch=armel)_ZNSt19_Sp_counted_deleterIPN6astyle12ASPeekStreamENSt12__shared_ptrIS1_LN9__gnu_cxx12_Lock_policyE1EE8_DeleterISaIS1_EEES8_LS5_1EED2Ev@Base
 3.0
  
(optional)_ZNSt6vectorIN6astyle10ASEnhancer15SwitchVariablesESaIS2_EE17_M_realloc_insertIJRS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base
 3.0
- 
_ZNSt6vectorIN6astyle9BraceTypeESaIS1_EE17_M_realloc_insertIJRS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base
 3.1
+ 
(optional)_ZNSt6vectorIN6astyle9BraceTypeESaIS1_EE17_M_realloc_insertIJRS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base
 3.1
  
_ZNSt6vectorIN6astyle9BraceTypeESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base
 3.0
  
_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJRS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base
 3.0
  
_ZNSt6vectorIPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EE12emplace_backIJRS7_EEEvDpOT_@Base
 3.0
  
_ZNSt6vectorIPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EE12emplace_backIJS7_EEEvDpOT_@Base
 0debian2.06
- 
_ZNSt6vectorIPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EE17_M_realloc_insertIJRS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base
 3.0
+ 
(optional)_ZNSt6vectorIPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EE17_M_realloc_insertIJRS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base
 3.0
  
(optional)_ZNSt6vectorIPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EE17_M_realloc_insertIJS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base
 3.0
  
(arch-bits=32)_ZNSt6vectorIPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EE7reserveEj@Base
 3.0
  
(arch-bits=64|optional)_ZNSt6vectorIPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EE7reserveEm@Base
 3.0
@@ -539,17 +539,18 @@
  
(optional)_ZNSt6vectorIPKSt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES7_ESaISA_EE17_M_realloc_insertIJSA_EEEvN9__gnu_cxx17__normal_iteratorIPSA_SC_EEDpOT_@Base
 3.0
  
(optional)_ZNSt6vectorIPN6astyle12ASBeautifierESaIS2_EE12emplace_backIJRS2_EEEvDpOT_@Base
 3.0
  
(optional)_ZNSt6vectorIPN6astyle12ASBeautifierESaIS2_EE12emplace_backIJS2_EEEvDpOT_@Base
 3.0
- 
_ZNSt6vectorIPN6astyle12ASBeautifierESaIS2_EE17_M_realloc_insertIJRS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base
 3.0
- 
_ZNSt6vectorIPN6astyle12ASBeautifierESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base
 3.1
+ 
(optional)_ZNSt6vectorIPN6astyle12ASBeautifierESaIS2_EE17_M_realloc_insertIJRS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base
 3.0
+ 
(optional)_ZNSt6vectorIPN6astyle12ASBeautifierESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base
 3.1
  
(optional)_ZNSt6vectorIPS_IPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EESaISA_EE12emplace_backIJSA_EEEvDpOT_@Base
 0debian2.06
- 
_ZNSt6vectorIPS_IPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EESaISA_EE17_M_realloc_insertIJSA_EEEvN9__gnu_cxx17__normal_iteratorIPSA_SC_EEDpOT_@Base
 3.0
+ 
(optional)_ZNSt6vectorIPS_IPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EESaISA_EE17_M_realloc_insertIJSA_EEEvN9__gnu_cxx17__normal_iteratorIPSA_SC_EEDpOT_@Base
 3.0
  
(optional)_ZNSt6vectorISt4pairIiiESaIS1_EE17_M_realloc_insertIJRS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base
 3.0
+ (optional)_ZNSt6vectorISt4pairIiiESaIS1_EE12emplace_backIJRS1_EEEvDpOT_@Base 
3.1
  _ZNSt6vectorISt4pairIiiESaIS1_EEaSERKS3_@Base 0debian2.06
  _ZNSt6vectorIbSaIbEE13_M_insert_auxESt13_Bit_iteratorb@Base 0debian2.06
  _ZNSt6vectorIiSaIiEE12emplace_backIJRiEEEvDpOT_@Base 3.0
  _ZNSt6vectorIiSaIiEE12emplace_backIJiEEEvDpOT_@Base