diff options
| author | Julian Andres Klode <jak@debian.org> | 2017-08-17 15:37:49 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2017-08-17 16:16:43 +0200 |
| commit | f63b3e01e436a8c0b4711b69a1a8794161e4c5a7 (patch) | |
| tree | 397635341e6dcf905f078c10951696e1843ef5da | |
| parent | 79c0a12d5c2d4fd8e6bfcf3a632a452239c07fe0 (diff) | |
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
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/libapt-pkg5.0.symbols | 1 | ||||
| -rwxr-xr-x | prepare-release | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/debian/control b/debian/control index 3431ba0c0..0ea6d2b55 100644 --- a/debian/control +++ b/debian/control @@ -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, diff --git a/debian/libapt-pkg5.0.symbols b/debian/libapt-pkg5.0.symbols index 030ad35e4..7d443d4b7 100644 --- a/debian/libapt-pkg5.0.symbols +++ b/debian/libapt-pkg5.0.symbols @@ -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 diff --git a/prepare-release b/prepare-release index 8c4e0978b..d7eb14705 100755 --- a/prepare-release +++ b/prepare-release @@ -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' |