From nobody Mon Jun 03 15:12:31 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VtHJv6DwBz5Mgff; Mon, 03 Jun 2024 15:12:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VtHJv3tHnz4sxY; Mon, 3 Jun 2024 15:12:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717427551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w4nKjHFPEjqAkTCufJtclLVa5NibpP7ZecFARpxCJdQ=; b=xbMNR6hPD+WRn1ws14mYt4o6/2biQATCMVSGca/y/axvg7chwHTR5Xk0/HrR4IVQp/qUaa wjr4XIFTL0ZsRb1gBk8Ek5r8E7jYUTw1Db+dtALbKffqAhNtb/qtB8FW0+/DK86dn/0u8+ FbxSYxrC7sAU207uLbyER49FyomSNDXisj2e431QyY8QWSehPIf51IfCFRy3ZVxaJ2EmhK HxfN8ZaOtko2wT0zvrB9nM8fXxD+CQHF7E1zGDgGKLijf3TU5SIxp+dGPj1NWAbey6ek+k LDjkIg9kF/+8Rojk9yT/DAEMt5bfBRaz1hZ4c/rHaT7LcC3swjPhNB0Y979wZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717427551; a=rsa-sha256; cv=none; b=Kil48u7HQd1WpOviC5rv3ozSBjCevxYZTbbKFmYlWqMcHhK3zB0+KovUPpjJMdi7IPtIEC oQ7u13F8tKqw47pVEFGQdfppgv+3okBkJU6KvcKpDWsudcMsDtEjio3TjbIyycFJL+/BVm 1ADys+AC2oYi4cYWq3+CD9s7preBuCd/1vZAW2w0OilLAOt0THZJ6r1OANkPz4gHtssNyO QV2fTM6EFsVuBQ8wXJqAcbyUS+xzsli/ViPJVh3DDVpeRVX1PExsjL2dQsvQiz/KOgqriN KP/k2a0uapKESBuyR9FPfTuFJltPCj28P06DeiLiikm2FOOf/GPxo5ZYl9KLMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717427551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w4nKjHFPEjqAkTCufJtclLVa5NibpP7ZecFARpxCJdQ=; b=onoWa3fru9EwjZ4BoZp2GuWjZashTb6PMBIUagf+TVhs7AKueHnp13F3GkVAlsfyQh0Z6/ 14sIu8siWodKF4E3/Wc7I5+klLh0LVY36Y+rJnJWvluL1/Q8tu03gLZPt0355BsgO5+gEB fBwnMiKJiDLLN7KxMskr5AD/iu62xoflIY4s7eFfjTg+ZzRjiPU4NTtr4zRGUSaG5Zl5tE OVN5oXkiuaQQINpHuG1FG3FM4GfiRvymgoEIObDaz0t/Xb+EdRPmSrPmrGtEwmXLOfQKv6 Exq18SBpvxpMRCV0JOkDMNzkCiLVqeq36m9zWP4I3598/R45Wbu1unZ39mc5Lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VtHJv2NvHzgBg; Mon, 3 Jun 2024 15:12:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 453FCVxe042582; Mon, 3 Jun 2024 15:12:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 453FCV2D042579; Mon, 3 Jun 2024 15:12:31 GMT (envelope-from git) Date: Mon, 3 Jun 2024 15:12:31 GMT Message-Id: <202406031512.453FCV2D042579@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 26de5918858a - main - java/openjfx14: fix build on non-amd64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26de5918858a242974d84b49d4dca3abb9d59baf Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=26de5918858a242974d84b49d4dca3abb9d59baf commit 26de5918858a242974d84b49d4dca3abb9d59baf Author: Piotr Kubaj AuthorDate: 2024-06-01 10:36:27 +0000 Commit: Piotr Kubaj 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 \