java8-openjfx/trunk/java8-openjfx-flags.patch

   1 diff -rupN rt-8u202-ga.orig/buildSrc/linux.gradle rt-8u202-ga/buildSrc/linux.gradle
   2 --- rt-8u202-ga.orig/buildSrc/linux.gradle      2019-06-03 15:45:22.599465670 +0200
   3 +++ rt-8u202-ga/buildSrc/linux.gradle   2019-06-03 15:50:59.746039363 +0200
   4 @@ -44,8 +44,11 @@ LINUX.library = { name -> return "lib${n
   5  def commonFlags = [
   6          "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
   7          "-fstack-protector",
   8 +        "-Wno-error=cast-function-type",
   9          "-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
  10
  11 +commonFlags.addAll(System.getenv("CFLAGS").trim().split(" "))
  12 +
  13  if (!IS_64) {
  14      commonFlags += "-m32"
  15  }
  16 @@ -60,6 +63,9 @@ def ccFlagsGTK3 = ccFlags
  17  def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
  18                   "-z", "relro",
  19                   "-Wl,--gc-sections"].flatten()
  20 +
  21 +linkFlags.addAll(System.getenv("LDFLAGS").trim().split(" "))
  22 +
  23  def defaultLinkFlags = linkFlags.flatten()
  24
  25  def gtk2CCFlags = [  ];
  26 @@ -274,7 +280,7 @@ LINUX.iio.nativeSource = [
  27  LINUX.iio.compiler = compiler
  28  LINUX.iio.ccFlags = [ccFlags].flatten()
  29  LINUX.iio.linker = linker
  30 -LINUX.iio.linkFlags = [linkFlags].flatten()
  31 +LINUX.iio.linkFlags = [linkFlags, "-ljpeg"].flatten()
  32  LINUX.iio.lib = "javafx_iio"
  33
  34  LINUX.prismES2 = [:]
  35 diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
  36 --- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile   2019-06-03 15:45:28.772858454 +0200
  37 +++ rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile        2019-06-03 15:52:15.503480874 +0200
  38 @@ -22,7 +22,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
  39  OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin
  40  endif
  41
  42 -CFLAGS = -fPIC                   \
  43 +CFLAGS := -fPIC                   \
  44           -Wformat                \
  45           -Wextra                 \
  46           -Wformat-security       \
  47 @@ -35,13 +35,8 @@ CFLAGS = -fPIC                   \
  48           -DGST_DISABLE_LOADSAVE  \
  49           -DGSTREAMER_LITE \
  50           -DG_DISABLE_DEPRECATED \
  51 -         -ffunction-sections -fdata-sections
  52 -
  53 -ifeq ($(BUILD_TYPE), Release)
  54 -    CFLAGS += -Os
  55 -else
  56 -    CFLAGS += -g -Wall
  57 -endif
  58 +         -ffunction-sections -fdata-sections \
  59 +         ${CFLAGS}
  60
  61  INCLUDES= -I../../../plugins                          \
  62            -I../../../plugins/av                       \
  63 @@ -51,11 +46,12 @@ INCLUDES= -I../../../plugins
  64            -I$(GLIB_DIR)/glib                          \
  65            -I$(GLIB_DIR)/gmodule
  66
  67 -LDFLAGS = -L$(BUILD_DIR)    \
  68 +LDFLAGS := -L$(BUILD_DIR)    \
  69            -z relro          \
  70            -lgstreamer-lite  \
  71            -lglib-lite  \
  72 -          -static-libgcc -static-libstdc++ -Wl,--gc-sections
  73 +          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
  74 +          ${LDFLAGS}
  75
  76  ifneq ($(strip $(LIBAV_DIR)),)
  77  INCLUDES += -I$(LIBAV_DIR)/include
  78 diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
  79 --- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile  2019-06-03 15:45:28.772858454 +0200
  80 +++ rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile       2019-06-03 15:53:26.784252777 +0200
  81 @@ -19,7 +19,7 @@ DIRLIST = progressbuffer       \
  82
  83  TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
  84
  85 -CFLAGS = -fPIC                   \
  86 +CFLAGS := -fPIC                   \
  87           -Wformat                \
  88           -Wextra                 \
  89           -Wformat-security       \
  90 @@ -36,14 +36,8 @@ CFLAGS = -fPIC                   \
  91           -DGST_DISABLE_GST_DEBUG \
  92           -DGSTREAMER_LITE \
  93           -DG_DISABLE_DEPRECATED \
  94 -         -ffunction-sections -fdata-sections
  95 -
  96 -ifeq ($(BUILD_TYPE), Release)
  97 -    CFLAGS += -Os
  98 -else
  99 -    CFLAGS += -g -Wall
 100 -endif
 101 -
 102 +         -ffunction-sections -fdata-sections \
 103 +         ${CFLAGS}
 104
 105  INCLUDES = -I$(SRCBASE_DIR) \
 106            $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
 107 @@ -53,9 +47,10 @@ INCLUDES = -I$(SRCBASE_DIR) \
 108             -I$(GLIB_DIR)/glib                        \
 109             -I$(GLIB_DIR)/gmodule
 110
 111 -LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
 112 +LDFLAGS := -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
 113            -z relro \
 114 -          -static-libgcc -static-libstdc++ -Wl,--gc-sections
 115 +          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
 116 +          ${LDFLAGS}
 117
 118  ifeq ($(ARCH), x32)
 119      CFLAGS += -m32
 120 diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
 121 --- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile     2019-06-03 15:45:28.772858454 +0200
 122 +++ rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile  2019-06-03 15:55:03.568631974 +0200
 123 @@ -41,7 +41,7 @@ DIRLIST = gstreamer/gst \
 124
 125  TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
 126
 127 -CFLAGS =-fPIC                   \
 128 +CFLAGS :=-fPIC                   \
 129          -Wformat                \
 130          -Wextra                 \
 131          -Wformat-security       \
 132 @@ -56,13 +56,8 @@ CFLAGS =-fPIC                   \
 133          -DGST_DISABLE_GST_DEBUG \
 134          -DGST_DISABLE_LOADSAVE  \
 135          -DG_DISABLE_DEPRECATED   \
 136 -        -ffunction-sections -fdata-sections
 137 -
 138 -ifeq ($(BUILD_TYPE), Release)
 139 -    CFLAGS += -Os
 140 -else
 141 -    CFLAGS += -g -Wall
 142 -endif
 143 +        -ffunction-sections -fdata-sections \
 144 +        ${CFLAGS}
 145
 146  INCLUDES = -I$(BASE_DIR)/plugins                          \
 147            -I$(SRCBASE_DIR)/projects/build/linux/common   \
 148 @@ -83,9 +78,10 @@ INCLUDES = -I$(BASE_DIR)/plugins
 149  PACKAGES_INCLUDES := $(shell pkg-config --cflags alsa)
 150  PACKAGES_LIBS := $(shell pkg-config --libs alsa)
 151
 152 -LDFLAGS = -L$(BUILD_DIR) -lm -lglib-lite $(PACKAGES_LIBS) \
 153 +LDFLAGS := -L$(BUILD_DIR) -lm -lglib-lite $(PACKAGES_LIBS) \
 154            -z relro \
 155 -          -static-libgcc -static-libstdc++ -Wl,--gc-sections
 156 +          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
 157 +          ${LDFLAGS}
 158
 159  ifeq ($(ARCH), x32)
 160      CFLAGS += -m32
 161 diff -rupN rt-8u202-ga.orig/modules/media/src/main/native/jfxmedia/projects/linux/Makefile rt-8u202-ga/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
 162 --- rt-8u202-ga.orig/modules/media/src/main/native/jfxmedia/projects/linux/Makefile     2019-06-03 15:45:28.819525570 +0200
 163 +++ rt-8u202-ga/modules/media/src/main/native/jfxmedia/projects/linux/Makefile  2019-06-03 15:57:02.209910725 +0200
 164 @@ -17,7 +17,7 @@ DIRLIST = jni                \
 165
 166  TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
 167
 168 -CFLAGS = -DTARGET_OS_LINUX=1     \
 169 +CFLAGS := -DTARGET_OS_LINUX=1     \
 170           -D_GNU_SOURCE           \
 171           -DGST_REMOVE_DEPRECATED \
 172           -DGST_DISABLE_GST_DEBUG \
 173 @@ -27,7 +27,8 @@ CFLAGS = -DTARGET_OS_LINUX=1     \
 174           -DJFXMEDIA_JNI_EXPORTS  \
 175           -DLINUX                 \
 176           -DG_DISABLE_DEPRECATED  \
 177 -         -ffunction-sections -fdata-sections
 178 +         -ffunction-sections -fdata-sections \
 179 +         ${CFLAGS}
 180
 181  CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections
 182
 183 @@ -57,21 +58,16 @@ ifdef HOST_COMPILE
 184                    -I$(GLIB_LITE_DIR)/glib \
 185                    -I$(GLIB_LITE_DIR)/gmodule
 186
 187 -       LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
 188 +LDFLAGS := -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
 189              -z relro \
 190 -            -static-libgcc -static-libstdc++ -Wl,--gc-sections
 191 +            -static-libgcc -static-libstdc++ -Wl,--gc-sections \
 192 +            ${LDFLAGS}
 193  else
 194         CFLAGS += $(EXTRA_CFLAGS)
 195         INCLUDES = $(BASE_INCLUDES)
 196         LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS)
 197  endif
 198
 199 -ifeq ($(BUILD_TYPE), Release)
 200 -       CFLAGS += -Os
 201 -else
 202 -       CFLAGS += -g -Wall -D_DEBUG
 203 -endif
 204 -
 205  ifeq ($(ARCH), x32)
 206      CFLAGS += -m32
 207      LDFLAGS += -m32
 208 --- rt-8u202-ga.orig/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile  2019-06-04 07:44:53.882738260 +0000
 209 +++ rt-8u202-ga/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile       2019-06-04 07:47:36.024744987 +0000
 210 @@ -40,20 +40,15 @@ CFLAGS += -fPIC \
 211           -DMATCH_LIMIT=10000000 \
 212           -DMATCH_LIMIT_RECURSION=10000000
 213
 214 -ifeq ($(BUILD_TYPE), Release)
 215 -    CFLAGS += -Os
 216 -else
 217 -    CFLAGS += -g -Wall
 218 -endif
 219 -
 220  INCLUDES = -I$(SRCBASE_DIR) \
 221            -I$(SRCBASE_DIR)/glib \
 222            -I$(SRCBASE_DIR)/build/linux \
 223            -I$(LIBFFI_DIR)/include
 224
 225 -LDFLAGS = -L$(BUILD_DIR) -lffi \
 226 +LDFLAGS := -L$(BUILD_DIR) -lffi \
 227            -z relro \
 228 -          -static-libgcc -static-libstdc++ -Wl,--gc-sections
 229 +          -static-libgcc -static-libstdc++ -Wl,--gc-sections \
 230 +          ${LDFLAGS}
 231
 232  ifeq ($(ARCH), x32)
 233      CFLAGS += -m32
 234