From nobody Thu Jun 30 22:21:14 2022 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 CE22D871754; Thu, 30 Jun 2022 22:21:14 +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 4LYt8V5Sp1z3NgS; Thu, 30 Jun 2022 22:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656627674; 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=kQUPsucEFODEN/msMwOq7QKfOF29pTz3ZaUMOFzCTQo=; b=ulK42gMyvjeuglFcI4V3Pcts0n7I5kuVjBILrQq4Q3kfBFsQGOMlXcfdfL2xp7DolcRdKz cS0uGsjXsSbRwqi6ilew3Fxng/2EClEs79MiqdCkH0+twM3sYbYCHIs+OnPSjQrP5bYvDr P5Tk2WjJ9B55uTyyzeiHK8VPleWT6rNpZ42en5yzZBjlvYw78zgq9iEnNNnrW5qkd1i2Jv 34kDGTLyy7pt/5wXL3uyCeXfVDChTi2HFfvbS90BRvzYfpDFiFiRVwezHIth1QngwFzh/8 OvfM/26fyVY7m3fVxuw2M2h0fRmpNRi9S1W2su1f5djLK2Ki3ODy0o0Wpj52dQ== 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 9CA516B78; Thu, 30 Jun 2022 22:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25UMLEhY013138; Thu, 30 Jun 2022 22:21:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25UMLEps013137; Thu, 30 Jun 2022 22:21:14 GMT (envelope-from git) Date: Thu, 30 Jun 2022 22:21:14 GMT Message-Id: <202206302221.25UMLEps013137@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: d63834673696 - main - multimedia/nymphcast: fix botched previous commit 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d63834673696356f0c15a9f00d7cda102bdc4316 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656627674; 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=kQUPsucEFODEN/msMwOq7QKfOF29pTz3ZaUMOFzCTQo=; b=h/BGATAIIfSIlK7pWiiUL5o4cEC3Iw6Piz5+rkg0EccePwhusrLr1AKr3h/J97Pl31+cSG kaLYBgDj1Qbd1Afc79wxTSQMyqUB+tnvXUx53+Xx31ZE78gBH+Q1AwHEVUvJBYOLyZKOhO rF2gVHN2ngwpsd3cOECCu5EERsALUy+rMu31t2TU7eCGGbAkLhxcS7IGpPJ+3XqG6OnI3S SMRiVzWH38ocOx1vbiOizPkUSG/KCcn2UAr0HGL/XhTxTPhq2u9GNPBTI7szIam4ab4n6L YonpHxBC2edG/qtN9l+8KJPEL5eNTZvRAmEz2PX1Y4+ZWhj9jXKXTa8WUqpxJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656627674; a=rsa-sha256; cv=none; b=wJVhx4/o2Bm0MzW9sXPuGLRCZz0lbOup9ZNmQhTwtK1m4c88gTbjannctypUjB4sCb27vG Fwts5funjlIAT2vwGq7TUBw8sv9tMfz4djT0V0/4vriHA7s092AWprNotEHrYu3A9czlO/ yEPxPzHpU2zja9H080FfG31yNPmOz8d7UK6vEt9tkoH30BHc5NWlOTX3TfTxIHe5r6WlpZ tZ4In12Tj+Ivr4EJPyxiN42bNBOB+V9h+BJxc8zfKdQtjENAZNqdJY3SpXV9bfU22yfr4S +CaWXRnl03SFrW7JpvX/qEWV93QVBClPR1sZe8ifkBJWRmyUxaUEW4nyztDyCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=d63834673696356f0c15a9f00d7cda102bdc4316 commit d63834673696356f0c15a9f00d7cda102bdc4316 Author: Adriaan de Groot AuthorDate: 2022-06-30 21:45:05 +0000 Commit: Adriaan de Groot CommitDate: 2022-06-30 22:21:12 +0000 multimedia/nymphcast: fix botched previous commit I have no idea what I was thinking in 78989b4e694c2a8264975fb6d64e3bf1c13762c2, which added a patch-file, instead of patching with that patch file to create patch files. PR: 263953 Reported by: Robert Clausecker --- ...cript_angelscript_projects_cmake_CMakeLists.txt | 10 ++++ ...-angelscript_angelscript_projects_gnuc_Makefile | 17 +++++++ multimedia/nymphcast/files/patch-armv7 | 58 ---------------------- 3 files changed, 27 insertions(+), 58 deletions(-) diff --git a/multimedia/nymphcast/files/patch-angelscript_angelscript_projects_cmake_CMakeLists.txt b/multimedia/nymphcast/files/patch-angelscript_angelscript_projects_cmake_CMakeLists.txt new file mode 100644 index 000000000000..3bc3c1339c0d --- /dev/null +++ b/multimedia/nymphcast/files/patch-angelscript_angelscript_projects_cmake_CMakeLists.txt @@ -0,0 +1,10 @@ +--- angelscript/angelscript/projects/cmake/CMakeLists.txt.orig 2022-05-12 21:14:16 UTC ++++ angelscript/angelscript/projects/cmake/CMakeLists.txt +@@ -110,7 +110,6 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm") + enable_language(ASM) + if(CMAKE_ASM_COMPILER_WORKS) + set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm.cpp ../../source/as_callfunc_arm_gcc.S) +- set_property(SOURCE ../../source/as_callfunc_arm_gcc.S APPEND PROPERTY COMPILE_FLAGS " -Wa,-mimplicit-it=always") + else() + message(FATAL ERROR "ARM target requires a working assembler") + endif() diff --git a/multimedia/nymphcast/files/patch-angelscript_angelscript_projects_gnuc_Makefile b/multimedia/nymphcast/files/patch-angelscript_angelscript_projects_gnuc_Makefile new file mode 100644 index 000000000000..bc8359c1e348 --- /dev/null +++ b/multimedia/nymphcast/files/patch-angelscript_angelscript_projects_gnuc_Makefile @@ -0,0 +1,17 @@ +--- angelscript/angelscript/projects/gnuc/Makefile.orig 2022-05-12 21:13:19 UTC ++++ angelscript/angelscript/projects/gnuc/Makefile +@@ -89,14 +89,8 @@ else + CXXFLAGS += $(PLATFORM_FLAGS) + endif + +-## Detect if targeting ARM CPU and if so tell assembler to accept implicit IT constructs in thumb mode + GCC_ARCH := $(shell $(CXX) -dumpmachine) + $(info GCC ARCH: $(GCC_ARCH)) +-ifneq (,$(findstring arm-,$(GCC_ARCH))) +- CXXFLAGS += -Wa,-mimplicit-it=thumb +-else ifneq (,$(findstring armv7-, $(GCC_ARCH))) +- CXXFLAGS += -Wa,-mimplicit-it=thumb +-endif + + ## toolchain + AR ?= ar diff --git a/multimedia/nymphcast/files/patch-armv7 b/multimedia/nymphcast/files/patch-armv7 deleted file mode 100644 index 38dda98732cc..000000000000 --- a/multimedia/nymphcast/files/patch-armv7 +++ /dev/null @@ -1,58 +0,0 @@ -From a72070398fb731f56ef57b19d8911158b0268029 Mon Sep 17 00:00:00 2001 -From: Robert Clausecker -Date: Fri, 13 May 2022 04:30:51 +0200 -Subject: [PATCH] multimedia/nymphcast: fix build on armv7 - -The build failed due to an unsupported compiler option --Wa,-mimplicit-it=thumb. This option is not needed when -building with clang, doubly so when building in ARM mode, -which we do. ---- - ...pt_angelscript_projects_cmake_CMakeLists.txt | 10 ++++++++++ - ...gelscript_angelscript_projects_gnuc_Makefile | 17 +++++++++++++++++ - 2 files changed, 27 insertions(+) - create mode 100644 multimedia/nymphcast/files/patch-angelscript_angelscript_projects_cmake_CMakeLists.txt - create mode 100644 multimedia/nymphcast/files/patch-angelscript_angelscript_projects_gnuc_Makefile - -diff --git a/multimedia/nymphcast/files/patch-angelscript_angelscript_projects_cmake_CMakeLists.txt b/multimedia/nymphcast/files/patch-angelscript_angelscript_projects_cmake_CMakeLists.txt -new file mode 100644 -index 000000000000..3bc3c1339c0d ---- /dev/null -+++ b/multimedia/nymphcast/files/patch-angelscript_angelscript_projects_cmake_CMakeLists.txt -@@ -0,0 +1,10 @@ -+--- angelscript/angelscript/projects/cmake/CMakeLists.txt.orig 2022-05-12 21:14:16 UTC -++++ angelscript/angelscript/projects/cmake/CMakeLists.txt -+@@ -110,7 +110,6 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm") -+ enable_language(ASM) -+ if(CMAKE_ASM_COMPILER_WORKS) -+ set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm.cpp ../../source/as_callfunc_arm_gcc.S) -+- set_property(SOURCE ../../source/as_callfunc_arm_gcc.S APPEND PROPERTY COMPILE_FLAGS " -Wa,-mimplicit-it=always") -+ else() -+ message(FATAL ERROR "ARM target requires a working assembler") -+ endif() -diff --git a/multimedia/nymphcast/files/patch-angelscript_angelscript_projects_gnuc_Makefile b/multimedia/nymphcast/files/patch-angelscript_angelscript_projects_gnuc_Makefile -new file mode 100644 -index 000000000000..bc8359c1e348 ---- /dev/null -+++ b/multimedia/nymphcast/files/patch-angelscript_angelscript_projects_gnuc_Makefile -@@ -0,0 +1,17 @@ -+--- angelscript/angelscript/projects/gnuc/Makefile.orig 2022-05-12 21:13:19 UTC -++++ angelscript/angelscript/projects/gnuc/Makefile -+@@ -89,14 +89,8 @@ else -+ CXXFLAGS += $(PLATFORM_FLAGS) -+ endif -+ -+-## Detect if targeting ARM CPU and if so tell assembler to accept implicit IT constructs in thumb mode -+ GCC_ARCH := $(shell $(CXX) -dumpmachine) -+ $(info GCC ARCH: $(GCC_ARCH)) -+-ifneq (,$(findstring arm-,$(GCC_ARCH))) -+- CXXFLAGS += -Wa,-mimplicit-it=thumb -+-else ifneq (,$(findstring armv7-, $(GCC_ARCH))) -+- CXXFLAGS += -Wa,-mimplicit-it=thumb -+-endif -+ -+ ## toolchain -+ AR ?= ar --- -2.35.2 -