diff options
Diffstat (limited to 'deb_patches')
| -rw-r--r-- | deb_patches/add-missing-include-functional.patch | 14 | ||||
| -rw-r--r-- | deb_patches/build-with-libstdc++-7.patch | 9 |
2 files changed, 5 insertions, 18 deletions
diff --git a/deb_patches/add-missing-include-functional.patch b/deb_patches/add-missing-include-functional.patch deleted file mode 100644 index d1ff90e..0000000 --- a/deb_patches/add-missing-include-functional.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: add missing #include directive for the use of std::function -Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1626972 -Author: Olivier Tilloy <olivier.tilloy@canonical.com> - ---- a/image/imgFrame.h -+++ b/image/imgFrame.h -@@ -7,6 +7,7 @@ - #ifndef mozilla_image_imgFrame_h - #define mozilla_image_imgFrame_h - -+#include <functional> - #include <utility> - - #include "AnimationParams.h" diff --git a/deb_patches/build-with-libstdc++-7.patch b/deb_patches/build-with-libstdc++-7.patch index 11812d6..c1279e0 100644 --- a/deb_patches/build-with-libstdc++-7.patch +++ b/deb_patches/build-with-libstdc++-7.patch @@ -4,7 +4,7 @@ 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_cfla +@@ -1433,6 +1433,9 @@ set_config('_DEPEND_CFLAGS', depend_cflags(c_compiler)) set_config('_HOST_DEPEND_CFLAGS', depend_cflags(host_c_compiler)) @@ -14,10 +14,11 @@ 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. -@@ -2118,6 +2121,7 @@ def linker_ldflags(linker, macos_sdk, ho +@@ -2125,7 +2128,7 @@ def linker_ldflags(linker, macos_sdk): + flags.append('-Wl,-syslibroot,%s' % macos_sdk) + else: flags.append('-Wl,--sysroot=%s' % macos_sdk) - elif host.cpu == 'arm': - flags.append('-Wl,--no-keep-memory') +- + flags.append('-static-libstdc++') return flags |