/[packages]/cauldron/java-1.8.0-openjfx/current/SOURCES/java-1.8.0-openjfx-1.8.0.102-build-flags-for-arm.patch
ViewVC logotype

Contents of /cauldron/java-1.8.0-openjfx/current/SOURCES/java-1.8.0-openjfx-1.8.0.102-build-flags-for-arm.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1051850 - (show annotations) (download)
Tue Sep 13 09:14:16 2016 UTC (8 years, 2 months ago) by ns80
File size: 3718 byte(s)
- add a patch adding Mga build and link flags for ARM

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-13 10:57:48.162382355 +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 --- 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
21 +++ 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
22 @@ -25,11 +25,8 @@
23 -DGST_DISABLE_LOADSAVE \
24 -DGSTREAMER_LITE
25
26 -ifeq ($(BUILD_TYPE), Release)
27 - CFLAGS += -Os
28 -else
29 - CFLAGS += -g -Wall
30 -endif
31 +CFLAGS += $(shell rpm --eval %{optflags})
32 +LDFLAGS += $(shell rpm --eval %{ldflags})
33
34 PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
35 PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0)
36 --- 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
37 +++ 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
38 @@ -26,12 +26,8 @@
39 -DGST_DISABLE_GST_DEBUG \
40 -DGSTREAMER_LITE
41
42 -ifeq ($(BUILD_TYPE), Release)
43 - CFLAGS += -Os
44 -else
45 - CFLAGS += -g -Wall
46 -endif
47 -
48 +CFLAGS += $(shell rpm --eval %{optflags})
49 +LDFLAGS += $(shell rpm --eval %{ldflags})
50
51 INCLUDES = -I$(SRCBASE_DIR) \
52 $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
53 --- 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
54 +++ 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
55 @@ -48,11 +48,8 @@
56 -DGST_DISABLE_GST_DEBUG \
57 -DGST_DISABLE_LOADSAVE
58
59 -ifeq ($(BUILD_TYPE), Release)
60 - CFLAGS += -Os
61 -else
62 - CFLAGS += -g -Wall
63 -endif
64 +CFLAGS += $(shell rpm --eval %{optflags})
65 +LDFLAGS += $(shell rpm --eval %{ldflags})
66
67 INCLUDES = -I$(BASE_DIR)/plugins \
68 -I$(SRCBASE_DIR)/projects/build/linux/common \
69 --- 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
70 +++ 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
71 @@ -58,11 +58,8 @@
72 LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS)
73 endif
74
75 -ifeq ($(BUILD_TYPE), Release)
76 - CFLAGS += -Os
77 -else
78 - CFLAGS += -g -Wall -D_DEBUG
79 -endif
80 +CFLAGS += $(shell rpm --eval %{optflags})
81 +LDFLAGS += $(shell rpm --eval %{ldflags})
82
83 CPP_SOURCES = \
84 jni/com_sun_media_jfxmedia_logging_Logger.cpp \

  ViewVC Help
Powered by ViewVC 1.1.30