Date: Mon, 3 Jun 2024 15:12:31 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 26de5918858a - main - java/openjfx14: fix build on non-amd64 Message-ID: <202406031512.453FCV2D042579@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=26de5918858a242974d84b49d4dca3abb9d59baf commit 26de5918858a242974d84b49d4dca3abb9d59baf Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2024-06-01 10:36:27 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2024-06-03 15:11:53 +0000 java/openjfx14: fix build on non-amd64 cc: error: unsupported option '-msse2' for target 'powerpc64-unknown-freebsd14.1' --- ..._src_main_native_gstreamer_projects_bsd_fxplugins_Makefile | 10 ++++++++++ ...src_main_native_gstreamer_projects_linux_avplugin_Makefile | 10 +++++++++- ...avafx.media_src_main_native_jfxmedia_projects_bsd_Makefile | 11 ++++++----- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/java/openjfx14/files/patch-modules_javafx.media_src_main_native_gstreamer_projects_bsd_fxplugins_Makefile b/java/openjfx14/files/patch-modules_javafx.media_src_main_native_gstreamer_projects_bsd_fxplugins_Makefile new file mode 100644 index 000000000000..b87efb00fdc7 --- /dev/null +++ b/java/openjfx14/files/patch-modules_javafx.media_src_main_native_gstreamer_projects_bsd_fxplugins_Makefile @@ -0,0 +1,10 @@ +--- modules/javafx.media/src/main/native/gstreamer/projects/bsd/fxplugins/Makefile.orig 2024-06-01 08:37:05 UTC ++++ modules/javafx.media/src/main/native/gstreamer/projects/bsd/fxplugins/Makefile +@@ -21,7 +21,6 @@ CFLAGS = -fPIC \ + -fstack-protector \ + -Werror=implicit-function-declaration \ + -Werror=trampolines \ +- -msse2 \ + -fbuiltin \ + -DHAVE_STDINT_H \ + -DLINUX \ diff --git a/java/openjfx14/files/patch-modules_javafx.media_src_main_native_gstreamer_projects_linux_avplugin_Makefile b/java/openjfx14/files/patch-modules_javafx.media_src_main_native_gstreamer_projects_linux_avplugin_Makefile index 1d019e231f7a..713473ab268c 100644 --- a/java/openjfx14/files/patch-modules_javafx.media_src_main_native_gstreamer_projects_linux_avplugin_Makefile +++ b/java/openjfx14/files/patch-modules_javafx.media_src_main_native_gstreamer_projects_linux_avplugin_Makefile @@ -1,6 +1,14 @@ --- modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile.orig 2020-07-17 10:21:33 UTC +++ modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -@@ -41,25 +41,16 @@ endif +@@ -24,7 +24,6 @@ CFLAGS = -fPIC \ + -fstack-protector \ + -Werror=implicit-function-declaration \ + -Werror=trampolines \ +- -msse2 \ + -fbuiltin \ + -DHAVE_STDINT_H \ + -DLINUX \ +@@ -41,25 +40,16 @@ PACKAGES_LIBS := $(shell pkg-config --libs glib-2. PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0) diff --git a/java/openjfx14/files/patch-modules_javafx.media_src_main_native_jfxmedia_projects_bsd_Makefile b/java/openjfx14/files/patch-modules_javafx.media_src_main_native_jfxmedia_projects_bsd_Makefile index bcb55296939c..1cc7c3ca9f22 100644 --- a/java/openjfx14/files/patch-modules_javafx.media_src_main_native_jfxmedia_projects_bsd_Makefile +++ b/java/openjfx14/files/patch-modules_javafx.media_src_main_native_jfxmedia_projects_bsd_Makefile @@ -1,4 +1,4 @@ ---- modules/javafx.media/src/main/native/jfxmedia/projects/bsd/Makefile.orig 2020-07-19 18:30:00 UTC +--- modules/javafx.media/src/main/native/jfxmedia/projects/bsd/Makefile.orig 2024-06-01 08:44:07 UTC +++ modules/javafx.media/src/main/native/jfxmedia/projects/bsd/Makefile @@ -1,5 +1,5 @@ # @@ -7,7 +7,7 @@ # BUILD_DIR = $(OUTPUT_DIR)/$(BUILD_TYPE) -@@ -18,6 +18,7 @@ DIRLIST = jni \ +@@ -18,6 +18,7 @@ CFLAGS = -DTARGET_OS_LINUX=1 \ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so CFLAGS = -DTARGET_OS_LINUX=1 \ @@ -23,15 +23,16 @@ -ffunction-sections -fdata-sections CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections -@@ -42,7 +44,6 @@ ifdef HOST_COMPILE +@@ -42,8 +44,6 @@ ifdef HOST_COMPILE -Wformat-security \ -fstack-protector \ -Werror=implicit-function-declaration \ - -Werror=trampolines \ - -msse2 \ +- -msse2 \ -DGSTREAMER_LITE -@@ -51,7 +52,7 @@ ifdef HOST_COMPILE + PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) +@@ -51,7 +51,7 @@ ifdef HOST_COMPILE INCLUDES = $(BASE_INCLUDES) \ -I$(JAVA_HOME)/include \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406031512.453FCV2D042579>