diff options
Diffstat (limited to 'dev-java/openjfx/files')
| -rw-r--r-- | dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch | 18 | ||||
| -rw-r--r-- | dev-java/openjfx/files/8/Wno-error.patch | 31 |
2 files changed, 0 insertions, 49 deletions
diff --git a/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch b/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch deleted file mode 100644 index 551a1e82ba50..000000000000 --- a/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Disable assembler in WebKit on unsupported architectures -Author: Emmanuel Bourg <ebourg@apache.org> -Forwarded: no ---- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h -+++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h -@@ -325,6 +325,12 @@ - #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 - #endif - -+#if !CPU(ARM_THUMB2) && !CPU(ARM_TRADITIONAL) && !CPU(MIPS) && !CPU(X86) && !CPU(X86_64) && !CPU(SH4) -+#define ENABLE_ASSEMBLER 0 -+#define ENABLE_JIT 0 -+#define ENABLE_YARR_JIT 0 -+#endif -+ - /* ==== OS() - underlying operating system; only to be used for mandated low-level services like - virtual memory, not to choose a GUI toolkit ==== */ - diff --git a/dev-java/openjfx/files/8/Wno-error.patch b/dev-java/openjfx/files/8/Wno-error.patch index 208411508d87..edc9389ee9ce 100644 --- a/dev-java/openjfx/files/8/Wno-error.patch +++ b/dev-java/openjfx/files/8/Wno-error.patch @@ -73,37 +73,6 @@ index 0bb8a530..38e98303 100644 "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() def glassCFlags = ["-ffast-math"] -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index f233b817..0f9d5252 100644 ---- a/buildSrc/linux.gradle -+++ b/buildSrc/linux.gradle -@@ -203,7 +203,7 @@ LINUX.glass.javahInclude = [ - "com/sun/glass/ui/gtk/*"] - LINUX.glass.glass.nativeSource = ft_gtk_launcher.getFiles() - LINUX.glass.glass.compiler = compiler --LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten() -+LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags].flatten() - LINUX.glass.glass.linker = linker - LINUX.glass.glass.linkFlags = [linkFlags, "-lX11", "-ldl" ].flatten() - LINUX.glass.glass.lib = "glass" -@@ -211,7 +211,7 @@ LINUX.glass.glass.lib = "glass" - LINUX.glass.glassgtk2 = [:] - LINUX.glass.glassgtk2.nativeSource = ft_gtk.getFiles() - LINUX.glass.glassgtk2.compiler = compiler --LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten() -+LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags].flatten() - LINUX.glass.glassgtk2.linker = linker - LINUX.glass.glassgtk2.linkFlags = [linkFlags, gtk2LinkFlags ].flatten() - LINUX.glass.glassgtk2.lib = "glassgtk2" -@@ -219,7 +219,7 @@ LINUX.glass.glassgtk2.lib = "glassgtk2" - LINUX.glass.glassgtk3 = [:] - LINUX.glass.glassgtk3.nativeSource = ft_gtk.getFiles() - LINUX.glass.glassgtk3.compiler = compiler --LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags, "-Werror"].flatten() -+LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags].flatten() - LINUX.glass.glassgtk3.linker = linker - LINUX.glass.glassgtk3.linkFlags = [linkFlags, gtk3LinkFlags ].flatten() - LINUX.glass.glassgtk3.lib = "glassgtk3" diff --git a/buildSrc/x86egl.gradle b/buildSrc/x86egl.gradle index 6bf6196b..ff24207d 100644 --- a/buildSrc/x86egl.gradle |