diff options
Diffstat (limited to 'deb_patches')
| -rw-r--r-- | deb_patches/build-with-libstdc++-7.patch | 28 | ||||
| -rw-r--r-- | deb_patches/drop-check-glibc-symbols.patch | 14 | ||||
| -rw-r--r-- | deb_patches/drop-libstdcxx-check.patch | 75 |
3 files changed, 13 insertions, 104 deletions
diff --git a/deb_patches/build-with-libstdc++-7.patch b/deb_patches/build-with-libstdc++-7.patch index c1279e0..82cf9cc 100644 --- a/deb_patches/build-with-libstdc++-7.patch +++ b/deb_patches/build-with-libstdc++-7.patch @@ -4,21 +4,29 @@ Bug-Ubuntu: https://launchpad.net/bugs/1856861 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure -@@ -1433,6 +1433,9 @@ set_config('_DEPEND_CFLAGS', depend_cflags(c_compiler)) +@@ -1252,6 +1252,7 @@ try_compile(includes=['cstddef'], + '# endif', + '#endif', + ]), ++ flags=['--gcc-toolchain=/usr/lib/gcc-mozilla'], + check_msg='for new enough STL headers from libstdc++', + when=needs_libstdcxx_newness_check, + onerror=die_on_old_libstdcxx) +@@ -1433,6 +1434,10 @@ set_config('_DEPEND_CFLAGS', depend_cfla set_config('_HOST_DEPEND_CFLAGS', depend_cflags(host_c_compiler)) ++add_old_configure_assignment('CFLAGS', ['--gcc-toolchain=/usr/lib/gcc-mozilla']) +add_old_configure_assignment('CXXFLAGS', ['--gcc-toolchain=/usr/lib/gcc-mozilla']) + + @depends(c_compiler) def preprocess_option(compiler): # The uses of PREPROCESS_OPTION depend on the spacing for -o/-Fi. -@@ -2125,7 +2128,7 @@ def linker_ldflags(linker, macos_sdk): - flags.append('-Wl,-syslibroot,%s' % macos_sdk) - else: +@@ -2137,6 +2142,7 @@ def linker_ldflags(linker, macos_sdk, ho flags.append('-Wl,--sysroot=%s' % macos_sdk) -- + elif host.cpu == 'arm': + flags.append('-Wl,--no-keep-memory') + flags.append('-static-libstdc++') return flags @@ -34,16 +42,6 @@ Bug-Ubuntu: https://launchpad.net/bugs/1856861 for dir in SEARCH_PATHS.iter() { builder = builder.clang_arg("-I").clang_arg(dir.to_str().unwrap()); } ---- a/build/unix/stdc++compat/moz.build -+++ b/build/unix/stdc++compat/moz.build -@@ -24,4 +24,7 @@ COMPILE_FLAGS['CLANG_PLUGIN'] = [] - DEFINES['MOZ_LIBSTDCXX_VERSION'] = CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION'] - HOST_DEFINES['MOZ_LIBSTDCXX_VERSION'] = CONFIG['MOZ_LIBSTDCXX_HOST_VERSION'] - -+CXXFLAGS += ['--gcc-toolchain=/usr/lib/gcc-mozilla'] -+HOST_CXXFLAGS += ['--gcc-toolchain=/usr/lib/gcc-mozilla'] -+ - OS_LIBS += ['-Wl,--version-script,%s/hide_std.ld' % SRCDIR] --- a/layout/style/test/moz.build +++ b/layout/style/test/moz.build @@ -18,6 +18,7 @@ DIRS += ['gtest'] diff --git a/deb_patches/drop-check-glibc-symbols.patch b/deb_patches/drop-check-glibc-symbols.patch deleted file mode 100644 index c21f0f3..0000000 --- a/deb_patches/drop-check-glibc-symbols.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/python/mozbuild/mozbuild/action/check_binary.py b/python/mozbuild/mozbuild/action/check_binary.py -index d85536f..1ce1305 100644 ---- a/python/mozbuild/mozbuild/action/check_binary.py -+++ b/python/mozbuild/mozbuild/action/check_binary.py -@@ -293,9 +293,7 @@ def checks(target, binary): - target = HOST - checks = [] - if target['MOZ_LIBSTDCXX_VERSION']: -- checks.append(check_stdcxx) - checks.append(check_libgcc) -- checks.append(check_glibc) - - # Disabled for local builds because of readelf performance: See bug 1472496 - if not buildconfig.substs.get('DEVELOPER_OPTIONS'): diff --git a/deb_patches/drop-libstdcxx-check.patch b/deb_patches/drop-libstdcxx-check.patch deleted file mode 100644 index f0abd29..0000000 --- a/deb_patches/drop-libstdcxx-check.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -r 55f4a0a504e4 build/moz.configure/toolchain.configure ---- a/build/moz.configure/toolchain.configure Wed Mar 18 05:41:31 2020 +0000 -+++ b/build/moz.configure/toolchain.configure Wed Mar 18 07:15:55 2020 +0100 -@@ -886,10 +886,6 @@ - return [] - - --def minimum_gcc_version(): -- return Version('7.1.0') -- -- - @template - def compiler(language, host_or_target, c_compiler=None, other_compiler=None, - other_c_compiler=None): -@@ -1016,11 +1012,10 @@ - if host_or_target.os == 'Android': - raise FatalCheckError('GCC is not supported on Android.\n' - 'Please use clang from the Android NDK instead.') -- gcc_version = minimum_gcc_version() -- if info.version < gcc_version: -+ if info.version < '7.1.0': - raise FatalCheckError( -- 'Only GCC %d.%d or newer is supported (found version %s).' -- % (gcc_version.major, gcc_version.minor, info.version)) -+ 'Only GCC 7.1 or newer is supported (found version %s).' -+ % info.version) - - if info.type == 'clang-cl': - if info.version < '8.0.0': -@@ -1218,45 +1213,6 @@ - 'about the target bitness.') - - --@depends(cxx_compiler, target) --def needs_libstdcxx_newness_check(cxx_compiler, target): -- # We only have to care about this on Linux and MinGW. -- if cxx_compiler.type == 'clang-cl': -- return -- -- if target.kernel not in ('Linux', 'WINNT'): -- return -- -- if target.os == 'Android': -- return -- -- return True -- -- --def die_on_old_libstdcxx(): -- die('The libstdc++ in use is not new enough. Please run ' -- './mach bootstrap to update your compiler, or update your system ' -- 'libstdc++ installation.') -- --try_compile(includes=['cstddef'], -- body='\n'.join([ -- # _GLIBCXX_RELEASE showed up in libstdc++ 7. -- '#if defined(__GLIBCXX__) && !defined(_GLIBCXX_RELEASE)', -- '# error libstdc++ not new enough', -- '#endif', -- '#if defined(_GLIBCXX_RELEASE)', -- '# if _GLIBCXX_RELEASE < %d' % minimum_gcc_version().major, -- '# error libstdc++ not new enough', -- '# else', -- ' (void) 0', -- '# endif', -- '#endif', -- ]), -- check_msg='for new enough STL headers from libstdc++', -- when=needs_libstdcxx_newness_check, -- onerror=die_on_old_libstdcxx) -- -- - @depends(c_compiler, target) - def default_debug_flags(compiler_info, target): - # Debug info is ON by default. |