changeset 11236:8d0b833ea001

8214810: Update to build scripts Reviewed-by: prr, almatvee, mschoene, rhalade
author kcr
date Thu, 06 Dec 2018 05:04:52 -0800
parents b74c8b1663d4
children 559c9b9d75a8
files buildSrc/linux.gradle modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
diffstat 5 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/buildSrc/linux.gradle	Tue Nov 20 08:28:24 2018 -0800
+++ b/buildSrc/linux.gradle	Thu Dec 06 05:04:52 2018 -0800
@@ -42,6 +42,7 @@
 // A set of common parameters to use for both compiling and linking
 def commonFlags = [
         "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
+        "-fstack-protector",
         "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
 
 if (!IS_64) {
@@ -56,6 +57,7 @@
 def ccFlagsGTK3 = ccFlags
 //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
 def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
+                 "-z", "relro",
                  "-Wl,--gc-sections"].flatten()
 
 if (IS_DEBUG_NATIVE) {
--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile	Tue Nov 20 08:28:24 2018 -0800
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile	Thu Dec 06 05:04:52 2018 -0800
@@ -21,6 +21,7 @@
          -Wformat                \
          -Wextra                 \
          -Wformat-security       \
+         -fstack-protector       \
          -Werror=implicit-function-declaration \
          -msse2                  \
          -fbuiltin               \
@@ -48,6 +49,7 @@
 LDFLAGS = -L$(BUILD_DIR)    \
           -lgstreamer-lite  \
            $(PACKAGES_LIBS) \
+          -z relro          \
           -static-libgcc -static-libstdc++ -Wl,--gc-sections
 
 ifneq ($(strip $(LIBAV_DIR)),)
--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile	Tue Nov 20 08:28:24 2018 -0800
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile	Thu Dec 06 05:04:52 2018 -0800
@@ -18,6 +18,7 @@
          -Wformat                \
          -Wextra                 \
          -Wformat-security       \
+         -fstack-protector       \
          -Werror=implicit-function-declaration \
          -msse2                  \
          -fbuiltin               \
@@ -47,6 +48,7 @@
 PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0)
 
 LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
+          -z relro \
           -static-libgcc -static-libstdc++ -Wl,--gc-sections
 
 ifeq ($(ARCH), x32)
--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile	Tue Nov 20 08:28:24 2018 -0800
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile	Thu Dec 06 05:04:52 2018 -0800
@@ -41,6 +41,7 @@
         -Wformat                \
         -Wextra                 \
         -Wformat-security       \
+        -fstack-protector       \
         -Werror=implicit-function-declaration \
         -D_GNU_SOURCE           \
         -DGST_REMOVE_DEPRECATED \
@@ -75,6 +76,7 @@
 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) \
+          -z relro \
           -static-libgcc -static-libstdc++ -Wl,--gc-sections
 
 ifeq ($(ARCH), x32)
--- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile	Tue Nov 20 08:28:24 2018 -0800
+++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile	Thu Dec 06 05:04:52 2018 -0800
@@ -40,6 +40,7 @@
                   -Wformat \
                   -Wextra \
                   -Wformat-security \
+                  -fstack-protector \
                   -Werror=implicit-function-declaration \
 		  -msse2 \
 	          -DGSTREAMER_LITE
@@ -56,6 +57,7 @@
 		  $(PACKAGES_INCLUDES)
 
 	LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
+            -z relro \
             -static-libgcc -static-libstdc++ -Wl,--gc-sections
 else
 	CFLAGS += $(EXTRA_CFLAGS)