Sophie

Sophie

distrib > Mageia > 6 > armv5tl > media > core-updates-src > by-pkgid > 32c337e63ebaebafa0dd617c75543e98 > files > 13

java-1.8.0-openjfx-1.8.0.191-1.b10.8.mga6.src.rpm

--- java-1.8.0-openjfx-1.8.0.191/buildSrc/linux.gradle~	2016-09-13 10:50:26.777852794 +0200
+++ java-1.8.0-openjfx-1.8.0.191/buildSrc/linux.gradle	2016-09-14 15:51:58.837447302 +0200
@@ -45,14 +45,18 @@
         "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
         "-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
 
+commonFlags.addAll("rpm --eval %{optflags}".execute().text.trim().split(" "))
+
 // Specify the compilation parameters and link parameters
 def ccFlags = [
         commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
         "-ffunction-sections", "-fdata-sections",
         IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
 //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
+ccFlags.addAll("rpm --eval %{optflags}".execute().text.trim().split(" "))
 def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
                  "-Wl,--gc-sections"].flatten()
+linkFlags.addAll("rpm --eval %{ldflags}".execute().text.trim().split(" "))
 def defaultLinkFlags = linkFlags.flatten()
 
 // Create $buildDir/linux_tools.properties file and load props from it
@@ -139,7 +143,7 @@
 LINUX.glass.compiler = compiler
 LINUX.glass.ccFlags = [ccFlags, "-Werror"].flatten()
 LINUX.glass.linker = linker
-LINUX.glass.linkFlags = [linkFlags].flatten()
+LINUX.glass.linkFlags = [linkFlags, "-lX11"].flatten()
 LINUX.glass.lib = "glass"
 
 LINUX.decora = [:]
@@ -201,7 +205,7 @@
 LINUX.prismES2.compiler = compiler
 LINUX.prismES2.ccFlags = ["-DLINUX", ccFlags].flatten()
 LINUX.prismES2.linker = linker
-LINUX.prismES2.linkFlags = [linkFlags, "-lX11", "-lXxf86vm", "-lGL"].flatten()
+LINUX.prismES2.linkFlags = [linkFlags, "-lX11", "-lXxf86vm", "-lGL", "-ldl"].flatten()
 LINUX.prismES2.lib = "prism_es2"
 
 def closedDir = file("$projectDir/../rt-closed")
@@ -213,7 +217,7 @@
 LINUX.font.nativeSource = [file("modules/graphics/src/main/native-font")]
 LINUX.font.ccFlags = ["-DJFXFONT_PLUS", ccFlags].flatten()
 LINUX.font.linker = linker
-LINUX.font.linkFlags = [linkFlags].flatten()
+LINUX.font.linkFlags = [linkFlags, "-ldl"].flatten()
 LINUX.font.lib = "javafx_font"
 
 LINUX.fontT2K = [:]
@@ -233,7 +237,7 @@
 LINUX.fontFreetype.compiler = compiler
 LINUX.fontFreetype.ccFlags = ["-DJFXFONT_PLUS", ccFlags, freetypeCCFlags].flatten()
 LINUX.fontFreetype.linker = linker
-LINUX.fontFreetype.linkFlags = [linkFlags, freetypeLinkFlags].flatten()
+LINUX.fontFreetype.linkFlags = [linkFlags, freetypeLinkFlags, "-ldl"].flatten()
 LINUX.fontFreetype.lib = "javafx_font_freetype"
 
 LINUX.fontPango = [:]
@@ -242,7 +246,7 @@
 LINUX.fontPango.compiler = compiler
 LINUX.fontPango.ccFlags = ["-DJFXFONT_PLUS", ccFlags, pangoCCFlags].flatten()
 LINUX.fontPango.linker = linker
-LINUX.fontPango.linkFlags = [linkFlags, pangoLinkFlags].flatten()
+LINUX.fontPango.linkFlags = [linkFlags, pangoLinkFlags, "-ldl"].flatten()
 LINUX.fontPango.lib = "javafx_font_pango"
 
 LINUX.media = [:]
--- java-1.8.0-openjfx-1.8.0.191/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile~	2016-09-13 10:50:26.777852794 +0200
+++ java-1.8.0-openjfx-1.8.0.191/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile	2016-09-13 10:59:37.670029799 +0200
@@ -36,11 +36,8 @@
          -DG_DISABLE_DEPRECATED \
          -ffunction-sections -fdata-sections
 
-ifeq ($(BUILD_TYPE), Release)
-    CFLAGS += -Os
-else
-    CFLAGS += -g -Wall
-endif
+CFLAGS  += $(shell rpm --eval %{optflags})
+LDFLAGS += $(shell rpm --eval %{ldflags})
 
 INCLUDES= -I../../../plugins                          \
           -I../../../plugins/av                       \
--- java-1.8.0-openjfx-1.8.0.191/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile~	2016-09-13 10:50:26.777852794 +0200
+++ java-1.8.0-openjfx-1.8.0.191/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile	2016-09-13 11:01:16.133941298 +0200
@@ -37,12 +37,8 @@
          -DG_DISABLE_DEPRECATED \
          -ffunction-sections -fdata-sections
 
-ifeq ($(BUILD_TYPE), Release)
-    CFLAGS += -Os
-else
-    CFLAGS += -g -Wall
-endif
-
+CFLAGS  += $(shell rpm --eval %{optflags})
+LDFLAGS += $(shell rpm --eval %{ldflags})
 
 INCLUDES = -I$(SRCBASE_DIR) \
 	   $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
--- java-1.8.0-openjfx-1.8.0.191/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile~	2018-11-13 09:00:48.568004474 +0100
+++ java-1.8.0-openjfx-1.8.0.191/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile	2018-11-13 09:02:49.182933324 +0100
@@ -39,11 +39,7 @@
          -DMATCH_LIMIT=10000000 \
          -DMATCH_LIMIT_RECURSION=10000000
 
-ifeq ($(BUILD_TYPE), Release)
-    CFLAGS += -Os
-else
-    CFLAGS += -g -Wall
-endif
+CFLAGS  += $(shell rpm --eval %{optflags})
 
 INCLUDES = -I$(SRCBASE_DIR) \
 	   -I$(SRCBASE_DIR)/glib \
--- java-1.8.0-openjfx-1.8.0.191/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile~	2016-09-13 10:50:26.777852794 +0200
+++ java-1.8.0-openjfx-1.8.0.191/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile	2016-09-13 11:02:11.978979312 +0200
@@ -57,11 +57,8 @@
         -DG_DISABLE_DEPRECATED   \
         -ffunction-sections -fdata-sections
 
-ifeq ($(BUILD_TYPE), Release)
-    CFLAGS += -Os
-else
-    CFLAGS += -g -Wall
-endif
+CFLAGS  += $(shell rpm --eval %{optflags})
+LDFLAGS += $(shell rpm --eval %{ldflags})
 
 INCLUDES = -I$(BASE_DIR)/plugins                          \
 	   -I$(SRCBASE_DIR)/projects/build/linux/common   \
--- java-1.8.0-openjfx-1.8.0.191/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile~	2018-11-13 09:00:48.568004474 +0100
+++ java-1.8.0-openjfx-1.8.0.191/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile	2018-11-13 09:03:24.521506170 +0100
@@ -19,11 +19,8 @@
          -DHAVE_AS_X86_PCREL \
          -DGSTREAMER_LITE
 
-ifeq ($(BUILD_TYPE), Release)
-    CFLAGS += -Os
-else
-    CFLAGS += -O0 -g -Wall
-endif
+CFLAGS  += $(shell rpm --eval %{optflags})
+LDFLAGS += $(shell rpm --eval %{ldflags})
 
 INCLUDES = -I$(SRCBASE_DIR)/include
 
--- java-1.8.0-openjfx-1.8.0.191/modules/media/src/main/native/jfxmedia/projects/linux/Makefile~	2016-09-13 10:50:26.777852794 +0200
+++ java-1.8.0-openjfx-1.8.0.191/modules/media/src/main/native/jfxmedia/projects/linux/Makefile	2016-09-13 11:02:41.844024312 +0200
@@ -64,11 +64,8 @@
 	LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS)
 endif
 
-ifeq ($(BUILD_TYPE), Release)
-	CFLAGS += -Os
-else
-	CFLAGS += -g -Wall -D_DEBUG
-endif
+CFLAGS  += $(shell rpm --eval %{optflags})
+LDFLAGS += $(shell rpm --eval %{ldflags}) -lpthread
 
 ifeq ($(ARCH), x32)
     INCLUDES += -I$(GLIB_LITE_DIR)/build/linux/x86