diff options
| -rw-r--r-- | deb_patches/build-with-libstdc++-7.patch | 12 | ||||
| -rw-r--r-- | deb_patches/drop-check-glibc-symbols.patch | 11 |
2 files changed, 9 insertions, 14 deletions
diff --git a/deb_patches/build-with-libstdc++-7.patch b/deb_patches/build-with-libstdc++-7.patch index dfc0665..5ad72dc 100644 --- a/deb_patches/build-with-libstdc++-7.patch +++ b/deb_patches/build-with-libstdc++-7.patch @@ -1,10 +1,8 @@ -Description: point clang to the toolchain provided by the gcc-mozilla package (version 7 required for C++ 17), and statically link against libstdc++ -Author: Olivier Tilloy <olivier.tilloy@canonical.com> -Bug-Ubuntu: https://launchpad.net/bugs/1856861 - +diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure +index 627596b..6c3b5b3 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure -@@ -1387,6 +1387,9 @@ set_config('_DEPEND_CFLAGS', depend_cfla +@@ -1433,6 +1433,9 @@ set_config('_DEPEND_CFLAGS', depend_cflags(c_compiler)) set_config('_HOST_DEPEND_CFLAGS', depend_cflags(host_c_compiler)) @@ -14,7 +12,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/1856861 @depends(c_compiler) def preprocess_option(compiler): # The uses of PREPROCESS_OPTION depend on the spacing for -o/-Fi. -@@ -2074,7 +2074,7 @@ +@@ -2116,7 +2119,7 @@ def linker_ldflags(linker, macos_sdk): flags.append('-Wl,-syslibroot,%s' % macos_sdk) else: flags.append('-Wl,--sysroot=%s' % macos_sdk) @@ -23,6 +21,8 @@ Bug-Ubuntu: https://launchpad.net/bugs/1856861 return flags +diff --git a/servo/components/style/build_gecko.rs b/servo/components/style/build_gecko.rs +index a502b7d..28370f6 100644 --- a/servo/components/style/build_gecko.rs +++ b/servo/components/style/build_gecko.rs @@ -148,6 +148,8 @@ impl BuilderExt for Builder { diff --git a/deb_patches/drop-check-glibc-symbols.patch b/deb_patches/drop-check-glibc-symbols.patch index 98cbf92..c21f0f3 100644 --- a/deb_patches/drop-check-glibc-symbols.patch +++ b/deb_patches/drop-check-glibc-symbols.patch @@ -1,12 +1,8 @@ -Description: Drop the glibc and stdcxx checks. - We're not compiling Firefox to run on a different version. -Author: Chris Coulson <chris.coulson@canonical.com> -Author: Olivier Tilloy <olivier.tilloy@canonical.com> -Forwarded: not-needed - +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 -@@ -296,9 +296,7 @@ def checks(target, binary): +@@ -293,9 +293,7 @@ def checks(target, binary): target = HOST checks = [] if target['MOZ_LIBSTDCXX_VERSION']: @@ -16,4 +12,3 @@ Forwarded: not-needed # Disabled for local builds because of readelf performance: See bug 1472496 if not buildconfig.substs.get('DEVELOPER_OPTIONS'): - |