summarylogtreecommitdiffstats
path: root/java-openjfx-flags.patch
blob: 40ed607b7c386181542f678d95290ec1ca9ed849 (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
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
diff -aur orig/buildSrc/linux.gradle patched/buildSrc/linux.gradle
--- orig/buildSrc/linux.gradle	2022-07-12 13:56:53.000000000 +0200
+++ patched/buildSrc/linux.gradle	2022-07-20 15:58:16.621288214 +0200
@@ -43,8 +43,11 @@
 def commonFlags = [
         "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
         "-fstack-protector",
+        "-Wno-error=cast-function-type",
         "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=trampolines"] // warning flags

+commonFlags.addAll(System.getenv("CFLAGS").trim().replaceAll(" +", " ").split(" "))
+
 if (!IS_64) {
     commonFlags += "-m32"
 }
@@ -70,6 +73,7 @@
 def staticLinkFlags = [].flatten()

 def linkFlags = IS_STATIC_BUILD ? staticLinkFlags : dynamicLinkFlags;
+linkFlags.addAll(System.getenv("LDFLAGS").trim().split(" "))

 if (IS_DEBUG_NATIVE) {
     linkFlags += "-g"
@@ -284,7 +288,7 @@
 LINUX.iio.compiler = compiler
 LINUX.iio.ccFlags = [cFlags, "-fvisibility=hidden"].flatten()
 LINUX.iio.linker = IS_STATIC_BUILD ? "ld" : linker
-LINUX.iio.linkFlags = [linkFlags].flatten()
+LINUX.iio.linkFlags = [linkFlags, "-ljpeg"].flatten()
 LINUX.iio.lib = "javafx_iio"

 LINUX.prismES2 = [:]
@@ -332,5 +336,5 @@
 LINUX.webkit = [:]
 LINUX.webkit.compiler = compiler
 LINUX.webkit.linker = linker
-LINUX.webkit.ccFlags = commonFlags.flatten()
+LINUX.webkit.ccFlags = [commonFlags, "-fno-lto"].flatten()
 LINUX.webkit.linkFlags = linkFlags.flatten()
Only in patched/buildSrc: linux.gradle.orig
diff -aur orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
--- orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile	2022-07-12 13:56:53.000000000 +0200
+++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile	2022-07-20 15:58:16.621288214 +0200
@@ -17,7 +17,7 @@
 OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin
 endif

-CFLAGS = -fPIC                   \
+CFLAGS := -fPIC                   \
          -Wformat                \
          -Wextra                 \
          -Wformat-security       \
@@ -31,17 +31,13 @@
          -DGSTREAMER_LITE \
          -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_48 \
          -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_48 \
-         -ffunction-sections -fdata-sections
+         -ffunction-sections -fdata-sections \
+         ${CFLAGS}

 ifneq (,$(findstring $(ARCH), x64 x32))
     CFLAGS += -msse2
 endif

-ifeq ($(BUILD_TYPE), Release)
-    CFLAGS += -Os
-else
-    CFLAGS += -g -Wall
-endif

 PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
 PACKAGES_LIBS     := $(shell pkg-config --libs glib-2.0 gobject-2.0)
@@ -52,11 +48,12 @@
           -I../../../gstreamer-lite/gstreamer/libs    \
           $(PACKAGES_INCLUDES)

-LDFLAGS = -L$(BUILD_DIR)    \
+LDFLAGS := -L$(BUILD_DIR)    \
           -lgstreamer-lite  \
            $(PACKAGES_LIBS) \
           -z relro          \
-          -static-libgcc -static-libstdc++ -Wl,--gc-sections
+          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
+          ${LDFLAGS}

 ifneq ($(strip $(LIBAV_DIR)),)
 INCLUDES += -I$(LIBAV_DIR)/include
Only in patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin: Makefile.orig
diff -aur orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
--- orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile	2022-07-12 13:56:53.000000000 +0200
+++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile	2022-07-20 15:58:16.621288214 +0200
@@ -14,7 +14,7 @@

 TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so

-CFLAGS = -fPIC                   \
+CFLAGS := -fPIC                   \
          -Wformat                \
          -Wextra                 \
          -Wformat-security       \
@@ -33,18 +33,13 @@
          -DGSTREAMER_LITE \
          -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_48 \
          -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_48 \
-         -ffunction-sections -fdata-sections
+         -ffunction-sections -fdata-sections \
+         ${CFLAGS}

 ifneq (,$(findstring $(ARCH), x64 x32))
     CFLAGS += -msse2
 endif

-ifeq ($(BUILD_TYPE), Release)
-    CFLAGS += -Os
-else
-    CFLAGS += -g -Wall
-endif
-

 INCLUDES = -I$(SRCBASE_DIR) \
 	   $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
@@ -54,9 +49,10 @@
 PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
 PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0)

-LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
+LDFLAGS := -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
           -z relro \
-          -static-libgcc -static-libstdc++ -Wl,--gc-sections
+          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
+          ${LDFLAGS}

 ifeq ($(ARCH), x32)
     CFLAGS += -m32
Only in patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins: Makefile.orig
diff -aur orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
--- orig/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile	2022-07-12 13:56:53.000000000 +0200
+++ patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile	2022-07-20 15:58:16.624621629 +0200
@@ -37,7 +37,7 @@

 TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so

-CFLAGS =-fPIC                   \
+CFLAGS :=-fPIC                   \
         -Wformat                \
         -Wextra                 \
         -Wformat-security       \
@@ -55,13 +55,8 @@
         -DGST_DISABLE_LOADSAVE  \
         -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_48 \
         -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_48 \
-        -ffunction-sections -fdata-sections
-
-ifeq ($(BUILD_TYPE), Release)
-    CFLAGS += -Os
-else
-    CFLAGS += -g -Wall
-endif
+        -ffunction-sections -fdata-sections \
+        ${CFLAGS}

 INCLUDES = -I$(BASE_DIR)/plugins                          \
 	   -I$(SRCBASE_DIR)/projects/build/linux/common   \
@@ -79,9 +74,10 @@
 PACKAGES_INCLUDES := $(shell pkg-config --cflags alsa glib-2.0)
 PACKAGES_LIBS := $(shell pkg-config --libs alsa glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0)

-LDFLAGS = -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) \
+LDFLAGS := -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) \
           -z relro \
-          -static-libgcc -static-libstdc++ -Wl,--gc-sections
+          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
+          ${LDFLAGS}

 ifeq ($(ARCH), x32)
     CFLAGS += -m32
Only in patched/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite: Makefile.orig
diff -aur orig/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile patched/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
--- orig/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile	2022-07-12 13:56:53.000000000 +0200
+++ patched/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile	2022-07-20 15:59:21.892883201 +0200
@@ -42,7 +42,7 @@

 TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so

-CFLAGS = -DTARGET_OS_LINUX=1     \
+CFLAGS := -DTARGET_OS_LINUX=1     \
          -D_GNU_SOURCE           \
          -DGST_REMOVE_DEPRECATED \
          -DGST_DISABLE_GST_DEBUG \
@@ -54,7 +54,8 @@
          -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_48 \
          -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_48 \
          -Werror=deprecated-declarations \
-         -ffunction-sections -fdata-sections
+         -ffunction-sections -fdata-sections \
+        ${CFLAGS}

 CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections

@@ -87,21 +88,16 @@
 	           -I$(GSTREAMER_LITE_DIR)/gstreamer/libs \
 		  $(PACKAGES_INCLUDES)

-	LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
+	LDFLAGS := -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
             -z relro \
-            -static-libgcc -static-libstdc++ -Wl,--gc-sections
+            -static-libgcc -static-libstdc++ -Wl,--gc-sections \
+            ${LDFLAGS}
 else
 	CFLAGS += $(EXTRA_CFLAGS)
 	INCLUDES = $(BASE_INCLUDES)
 	LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS)
 endif

-ifeq ($(BUILD_TYPE), Release)
-	CFLAGS += -Os
-else
-	CFLAGS += -g -Wall -D_DEBUG
-endif
-
 ifeq ($(ARCH), x32)
     CFLAGS += -m32
     LDFLAGS += -m32