1 |
--- java-1.8.0-openjfx-1.8.0.102/buildSrc/linux.gradle~ 2016-09-13 10:50:26.777852794 +0200 |
2 |
+++ java-1.8.0-openjfx-1.8.0.102/buildSrc/linux.gradle 2016-09-14 15:51:58.837447302 +0200 |
3 |
@@ -45,12 +45,16 @@ |
4 |
"-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags |
5 |
"-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags |
6 |
|
7 |
+commonFlags.addAll("rpm --eval %{optflags}".execute().text.trim().split(" ")) |
8 |
+ |
9 |
// Specify the compilation parameters and link parameters |
10 |
def ccFlags = [ |
11 |
commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", |
12 |
IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten() |
13 |
//ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"]) |
14 |
+ccFlags.addAll("rpm --eval %{optflags}".execute().text.trim().split(" ")) |
15 |
def linkFlags = ["-shared", commonFlags].flatten() |
16 |
+linkFlags.addAll("rpm --eval %{ldflags}".execute().text.trim().split(" ")) |
17 |
|
18 |
// Create $buildDir/linux_tools.properties file and load props from it |
19 |
setupTools("linux_tools", |
20 |
@@ -136,7 +140,7 @@ |
21 |
LINUX.glass.compiler = compiler |
22 |
LINUX.glass.ccFlags = [ccFlags, "-Werror"].flatten() |
23 |
LINUX.glass.linker = linker |
24 |
-LINUX.glass.linkFlags = [linkFlags].flatten() |
25 |
+LINUX.glass.linkFlags = [linkFlags, "-lX11"].flatten() |
26 |
LINUX.glass.lib = "glass" |
27 |
|
28 |
LINUX.decora = [:] |
29 |
@@ -197,7 +201,7 @@ |
30 |
LINUX.prismES2.compiler = compiler |
31 |
LINUX.prismES2.ccFlags = ["-DLINUX", ccFlags].flatten() |
32 |
LINUX.prismES2.linker = linker |
33 |
-LINUX.prismES2.linkFlags = [linkFlags, "-lX11", "-lXxf86vm", "-lGL"].flatten() |
34 |
+LINUX.prismES2.linkFlags = [linkFlags, "-lX11", "-lXxf86vm", "-lGL", "-ldl"].flatten() |
35 |
LINUX.prismES2.lib = "prism_es2" |
36 |
|
37 |
def closedDir = file("$projectDir/../rt-closed") |
38 |
@@ -209,7 +213,7 @@ |
39 |
LINUX.font.nativeSource = [file("modules/graphics/src/main/native-font")] |
40 |
LINUX.font.ccFlags = ["-DJFXFONT_PLUS", ccFlags].flatten() |
41 |
LINUX.font.linker = linker |
42 |
-LINUX.font.linkFlags = [linkFlags].flatten() |
43 |
+LINUX.font.linkFlags = [linkFlags, "-ldl"].flatten() |
44 |
LINUX.font.lib = "javafx_font" |
45 |
|
46 |
LINUX.fontT2K = [:] |
47 |
@@ -229,7 +233,7 @@ |
48 |
LINUX.fontFreetype.compiler = compiler |
49 |
LINUX.fontFreetype.ccFlags = ["-DJFXFONT_PLUS", ccFlags, freetypeCCFlags].flatten() |
50 |
LINUX.fontFreetype.linker = linker |
51 |
-LINUX.fontFreetype.linkFlags = [linkFlags, freetypeLinkFlags].flatten() |
52 |
+LINUX.fontFreetype.linkFlags = [linkFlags, freetypeLinkFlags, "-ldl"].flatten() |
53 |
LINUX.fontFreetype.lib = "javafx_font_freetype" |
54 |
|
55 |
LINUX.fontPango = [:] |
56 |
@@ -238,7 +242,7 @@ |
57 |
LINUX.fontPango.compiler = compiler |
58 |
LINUX.fontPango.ccFlags = ["-DJFXFONT_PLUS", ccFlags, pangoCCFlags].flatten() |
59 |
LINUX.fontPango.linker = linker |
60 |
-LINUX.fontPango.linkFlags = [linkFlags, pangoLinkFlags].flatten() |
61 |
+LINUX.fontPango.linkFlags = [linkFlags, pangoLinkFlags, "-ldl"].flatten() |
62 |
LINUX.fontPango.lib = "javafx_font_pango" |
63 |
|
64 |
LINUX.media = [:] |
65 |
--- java-1.8.0-openjfx-1.8.0.102/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile~ 2016-09-13 10:50:26.777852794 +0200 |
66 |
+++ java-1.8.0-openjfx-1.8.0.102/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile 2016-09-13 10:59:37.670029799 +0200 |
67 |
@@ -25,11 +25,8 @@ |
68 |
-DGST_DISABLE_LOADSAVE \ |
69 |
-DGSTREAMER_LITE |
70 |
|
71 |
-ifeq ($(BUILD_TYPE), Release) |
72 |
- CFLAGS += -Os |
73 |
-else |
74 |
- CFLAGS += -g -Wall |
75 |
-endif |
76 |
+CFLAGS += $(shell rpm --eval %{optflags}) |
77 |
+LDFLAGS += $(shell rpm --eval %{ldflags}) |
78 |
|
79 |
PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) |
80 |
PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0) |
81 |
--- java-1.8.0-openjfx-1.8.0.102/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile~ 2016-09-13 10:50:26.777852794 +0200 |
82 |
+++ java-1.8.0-openjfx-1.8.0.102/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile 2016-09-13 11:01:16.133941298 +0200 |
83 |
@@ -26,12 +26,8 @@ |
84 |
-DGST_DISABLE_GST_DEBUG \ |
85 |
-DGSTREAMER_LITE |
86 |
|
87 |
-ifeq ($(BUILD_TYPE), Release) |
88 |
- CFLAGS += -Os |
89 |
-else |
90 |
- CFLAGS += -g -Wall |
91 |
-endif |
92 |
- |
93 |
+CFLAGS += $(shell rpm --eval %{optflags}) |
94 |
+LDFLAGS += $(shell rpm --eval %{ldflags}) |
95 |
|
96 |
INCLUDES = -I$(SRCBASE_DIR) \ |
97 |
$(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \ |
98 |
--- java-1.8.0-openjfx-1.8.0.102/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile~ 2016-09-13 10:50:26.777852794 +0200 |
99 |
+++ java-1.8.0-openjfx-1.8.0.102/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile 2016-09-13 11:02:11.978979312 +0200 |
100 |
@@ -48,11 +48,8 @@ |
101 |
-DGST_DISABLE_GST_DEBUG \ |
102 |
-DGST_DISABLE_LOADSAVE |
103 |
|
104 |
-ifeq ($(BUILD_TYPE), Release) |
105 |
- CFLAGS += -Os |
106 |
-else |
107 |
- CFLAGS += -g -Wall |
108 |
-endif |
109 |
+CFLAGS += $(shell rpm --eval %{optflags}) |
110 |
+LDFLAGS += $(shell rpm --eval %{ldflags}) |
111 |
|
112 |
INCLUDES = -I$(BASE_DIR)/plugins \ |
113 |
-I$(SRCBASE_DIR)/projects/build/linux/common \ |
114 |
--- java-1.8.0-openjfx-1.8.0.102/modules/media/src/main/native/jfxmedia/projects/linux/Makefile~ 2016-09-13 10:50:26.777852794 +0200 |
115 |
+++ java-1.8.0-openjfx-1.8.0.102/modules/media/src/main/native/jfxmedia/projects/linux/Makefile 2016-09-13 11:02:41.844024312 +0200 |
116 |
@@ -58,11 +58,8 @@ |
117 |
LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS) |
118 |
endif |
119 |
|
120 |
-ifeq ($(BUILD_TYPE), Release) |
121 |
- CFLAGS += -Os |
122 |
-else |
123 |
- CFLAGS += -g -Wall -D_DEBUG |
124 |
-endif |
125 |
+CFLAGS += $(shell rpm --eval %{optflags}) |
126 |
+LDFLAGS += $(shell rpm --eval %{ldflags}) |
127 |
|
128 |
CPP_SOURCES = \ |
129 |
jni/com_sun_media_jfxmedia_logging_Logger.cpp \ |