Sophie

Sophie

distrib > Mageia > 5 > x86_64 > media > core-backports-src > by-pkgid > c442dd73602c2723b80bbea1ec724693 > files > 6

java-1.8.0-openjfx-1.8.0.141-1.b14.1.mga5.src.rpm

--- java-1.8.0-openjfx-1.8.0.102/buildSrc/linux.gradle~	2016-09-13 10:50:26.777852794 +0200
+++ java-1.8.0-openjfx-1.8.0.102/buildSrc/linux.gradle	2016-09-14 15:51:58.837447302 +0200
@@ -45,12 +45,16 @@
         "-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",
         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 = ["-shared", commonFlags].flatten()
+linkFlags.addAll("rpm --eval %{ldflags}".execute().text.trim().split(" "))
 
 // Create $buildDir/linux_tools.properties file and load props from it
 setupTools("linux_tools",
@@ -136,7 +140,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 = [:]
@@ -197,7 +201,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")
@@ -209,7 +213,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 = [:]
@@ -229,7 +233,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 = [:]
@@ -238,7 +242,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.102/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.102/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile	2016-09-13 10:59:37.670029799 +0200
@@ -25,11 +25,8 @@
          -DGST_DISABLE_LOADSAVE  \
          -DGSTREAMER_LITE
 
-ifeq ($(BUILD_TYPE), Release)
-    CFLAGS += -Os
-else
-    CFLAGS += -g -Wall
-endif
+CFLAGS  += $(shell rpm --eval %{optflags})
+LDFLAGS += $(shell rpm --eval %{ldflags})
 
 PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
 PACKAGES_LIBS     := $(shell pkg-config --libs glib-2.0 gobject-2.0)
--- 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
+++ 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
@@ -26,12 +26,8 @@
          -DGST_DISABLE_GST_DEBUG \
          -DGSTREAMER_LITE
 
-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.102/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.102/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile	2016-09-13 11:02:11.978979312 +0200
@@ -48,11 +48,8 @@
         -DGST_DISABLE_GST_DEBUG \
         -DGST_DISABLE_LOADSAVE
 
-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.102/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.102/modules/media/src/main/native/jfxmedia/projects/linux/Makefile	2016-09-13 11:02:41.844024312 +0200
@@ -58,11 +58,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})
 
 CPP_SOURCES = \
         jni/com_sun_media_jfxmedia_logging_Logger.cpp           \