Browse Source

Handle GCC 7 std::string operator ABI break

We now require gcc 7 on the packaging side, and add an appropriate
symbol to our symbols file.

Also adjust prepare-release to ignore g++ version requirements
when setting up build dependencies on CI.

Closes: #871275
tags/debian/1.5_beta2
Julian Andres Klode 3 years ago
parent
commit
f63b3e01e4
3 changed files with 3 additions and 0 deletions
  1. +1
    -0
      debian/control
  2. +1
    -0
      debian/libapt-pkg5.0.symbols
  3. +1
    -0
      prepare-release

+ 1
- 0
debian/control View File

@@ -14,6 +14,7 @@ Build-Depends: cmake (>= 3.4),
dpkg-dev (>= 1.17.14),
gettext (>= 0.12),
googletest <!nocheck> | libgtest-dev <!nocheck>,
g++ (>= 4:7),
libbz2-dev,
libcurl4-gnutls-dev (>= 7.19.4~),
libdb-dev,


+ 1
- 0
debian/libapt-pkg5.0.symbols View File

@@ -357,6 +357,7 @@ libapt-pkg.so.5.0 libapt-pkg5.0 #MINVER#
(c++)"URI::CopyFrom(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_5.0" 0.8.0
(c++)"URI::SiteOnly(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_5.0" 0.8.0
(c++)"URI::operator std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >[abi:cxx11]()@APTPKG_5.0" 0.8.0
(c++)"URI::operator std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >()@APTPKG_5.0" 1.5~beta2~
(c++)"MMap::Map(FileFd&)@APTPKG_5.0" 0.8.0
(c++)"MMap::Sync(unsigned long, unsigned long)@APTPKG_5.0" 0.8.0
(c++)"MMap::Sync()@APTPKG_5.0" 0.8.0


+ 1
- 0
prepare-release View File

@@ -41,6 +41,7 @@ test_deb_control() {
-e 's#@[^,<>()@]*@##g' \
-e 's#dpkg-dev \([^)]*\)#dpkg-dev#g' \
-e 's#debhelper \([^)]*\)#debhelper#g' \
-e 's#g\+\+ \([^)]*\)#g++#g' \
-e 's#@##g' \
-e 's#,(\s+,)+#, #g' \
-e 's#\s+# #g'


Loading…
Cancel
Save