aboutsummaryrefslogtreecommitdiffstats
path: root/testing/openjfx12/fix-arm32-build.patch
blob: 153ded3d658d9f95c7e30a1d3a8d540f46c83144 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
--- old/buildSrc/linux.gradle
+++ new/buildSrc/linux.gradle
@@ -45,10 +45,6 @@
         "-fstack-protector",
         "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration", "-Werror=trampolines"] // warning flags
 
-if (!IS_64) {
-    commonFlags += "-m32"
-}
-
 // Specify the compilation parameters and link parameters
 def ccFlags = [
         commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
@@ -64,11 +64,6 @@
 LDFLAGS  += $(shell pkg-config --libs libavcodec libavformat)
 endif
 
-ifeq ($(ARCH), x32)
-    CFLAGS += -m32
-    LDFLAGS += -m32
-endif
-
 SOURCES = av/fxavcodecplugin.c  \
           av/avelement.c        \
           av/decoder.c          \
--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
@@ -55,11 +55,6 @@
           -z relro \
           -static-libgcc -static-libstdc++ -Wl,--gc-sections
 
-ifeq ($(ARCH), x32)
-    CFLAGS += -m32
-    LDFLAGS += -m32
-endif
-
 SOURCES = fxplugins.c                        \
           progressbuffer/progressbuffer.c    \
           progressbuffer/hlsprogressbuffer.c \
--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
@@ -80,11 +80,6 @@
           -z relro \
           -static-libgcc -static-libstdc++ -Wl,--gc-sections
 
-ifeq ($(ARCH), x32)
-    CFLAGS += -m32
-    LDFLAGS += -m32
-endif
-
 SOURCES = \
 gstreamer/gst/gst.c \
             gstreamer/gst/gstallocator.c \
--- old/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
+++ new/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
@@ -75,11 +75,6 @@
 	CFLAGS += -g -Wall -D_DEBUG
 endif
 
-ifeq ($(ARCH), x32)
-    CFLAGS += -m32
-    LDFLAGS += -m32
-endif
-
 CPP_SOURCES = \
         jni/com_sun_media_jfxmedia_logging_Logger.cpp           \
         jni/JavaBandsHolder.cpp 				\