diff options
| author | Simon Frankenberger <simon@fraho.eu> | 2019-02-11 23:48:21 +0100 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2019-10-24 22:57:49 +0200 |
| commit | 40247420d123ab342128ea409d5a949fe072eafe (patch) | |
| tree | 3a19d4b1965e15c514b77a32b371b48c92dc8dc6 /testing/openjfx11/fix-arm32-build.patch | |
| parent | 4e4d49d380a193970dee1295bea2cd886d0c6d34 (diff) | |
| download | aports-40247420d123ab342128ea409d5a949fe072eafe.tar.bz2 aports-40247420d123ab342128ea409d5a949fe072eafe.tar.xz | |
testing/openjfx11: New aport
Diffstat (limited to 'testing/openjfx11/fix-arm32-build.patch')
| -rw-r--r-- | testing/openjfx11/fix-arm32-build.patch | 91 |
1 files changed, 91 insertions, 0 deletions
diff --git a/testing/openjfx11/fix-arm32-build.patch b/testing/openjfx11/fix-arm32-build.patch new file mode 100644 index 0000000000..df529fde7f --- /dev/null +++ b/testing/openjfx11/fix-arm32-build.patch @@ -0,0 +1,91 @@ +Taken from: https://sources.debian.org/patches/openjfx/11.0.2+1-1/fix-arm32-build.patch +--- old/buildSrc/linux.gradle ++++ new/buildSrc/linux.gradle +@@ -46,10 +46,6 @@ + "-fstack-protector", + "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags + +-if (!IS_64) { +- commonFlags += "-m32" +-} +- + // Specify the compilation parameters and link parameters + def ccFlags = [ + commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", +@@ -287,20 +283,12 @@ + LINUX.launcher.ccFlags = ["-Wextra", "-Wformat", "-Wformat-security", "-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c"] + LINUX.launcher.linker = linker + LINUX.launcher.linkFlags = ["-ldl"] +-if (!IS_64) { +- LINUX.launcher.ccFlags += "-m32" +- LINUX.launcher.linkFlags += "-m32" +-} + + LINUX.launcherlibrary = [:] + LINUX.launcherlibrary.compiler = compiler + LINUX.launcherlibrary.ccFlags = ["-Wextra", "-Wformat", "-Wformat-security", "-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC", "-std=gnu++98", "-ffunction-sections", "-fdata-sections"] + LINUX.launcherlibrary.linker = linker + LINUX.launcherlibrary.linkFlags = ["-ldl", "-lpthread", "-shared", "-static-libgcc", "-static-libstdc++", "-Wl,--gc-sections"] +-if (!IS_64) { +- LINUX.launcherlibrary.ccFlags += "-m32" +- LINUX.launcherlibrary.linkFlags += "-m32" +-} + + LINUX.iio = [:] + LINUX.iio.nativeSource = [ +--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile ++++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +@@ -63,11 +63,6 @@ + LDFLAGS += $(shell pkg-config --libs libavcodec libavformat) + endif + +-ifeq ($(ARCH), x32) +- CFLAGS += -m32 +- LDFLAGS += -m32 +-endif +- + SOURCES = av/fxavcodecplugin.c \ + av/avelement.c \ + av/decoder.c \ +--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile ++++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +@@ -54,11 +54,6 @@ + -z relro \ + -static-libgcc -static-libstdc++ -Wl,--gc-sections + +-ifeq ($(ARCH), x32) +- CFLAGS += -m32 +- LDFLAGS += -m32 +-endif +- + SOURCES = fxplugins.c \ + progressbuffer/progressbuffer.c \ + progressbuffer/hlsprogressbuffer.c \ +--- old/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile ++++ new/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile +@@ -79,11 +79,6 @@ + -z relro \ + -static-libgcc -static-libstdc++ -Wl,--gc-sections + +-ifeq ($(ARCH), x32) +- CFLAGS += -m32 +- LDFLAGS += -m32 +-endif +- + SOURCES = \ + gstreamer/gst/gst.c \ + gstreamer/gst/gstallocator.c \ +--- old/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile ++++ new/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +@@ -74,11 +74,6 @@ + CFLAGS += -g -Wall -D_DEBUG + endif + +-ifeq ($(ARCH), x32) +- CFLAGS += -m32 +- LDFLAGS += -m32 +-endif +- + CPP_SOURCES = \ + jni/com_sun_media_jfxmedia_logging_Logger.cpp \ + jni/JavaBandsHolder.cpp \ |