From nobody Mon May 16 19:00:03 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 EA2AF1AED532; Mon, 16 May 2022 19:00:03 +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 4L27q76GkMz4nvw; Mon, 16 May 2022 19:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652727603; 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=FMtVeTgOhqL4ZQihAmALqmNiDU0Y9HB0zl4vWwP5FD8=; b=PaopGPOzv4E9nJZDKotAFUAoWd4AW6/47GnsQ8oIf2tflgm4ePGEW0D7F7ZZoCgsl9bRSk PCj7zliOYUcshieNWC9ecXiVw5C1S+y2X4NuQzN+Vq0uesTR0Rx9+TRujCOx2D50cBV17P ptjliNUdYQJ8G2MJEdg2JOG/2mjxbMQfNzew7kXchKEWwDmBipuQMvjMGFmVMJQDdtoHG9 NJmE+okFGSTHaaXaVwF8diA9h9XZ/A6YnGegUIu5fbnJEso2rgVWYtCQLDi2GbV+WHdguF vUQs6Rbl5OdU74swZhtU1jFmwN7V4ucPlYm4if2+/QNdyn3YuNeByLxrs8We+A== 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 B727925928; Mon, 16 May 2022 19:00:03 +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 24GJ033w093990; Mon, 16 May 2022 19:00:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GJ03T8093987; Mon, 16 May 2022 19:00:03 GMT (envelope-from git) Date: Mon, 16 May 2022 19:00:03 GMT Message-Id: <202205161900.24GJ03T8093987@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: 78989b4e694c - main - multimedia/nymphcast: fix build on ARMv7 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: 78989b4e694c2a8264975fb6d64e3bf1c13762c2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652727603; 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=FMtVeTgOhqL4ZQihAmALqmNiDU0Y9HB0zl4vWwP5FD8=; b=qKgitSK5v72IVL0wry3T6poC1xE10VZxWEskRrGKE/ks0LSCcuaC2P6986xpmNtHaJpVcb hD8A2oaWVy+8ZagIXvRyIBeoiqKuTLTUGyVbUDMil56LfL/Ia2K5ZB0/H8Zb8iJNwTj177 5JN71tbKwnKctEiWzCTVAF1QqHoh3wBUenxK6Sd9sQjv1ojza4RgC9794gJdmwyJ5H15fA T4Q9ad3lqjrcnM1mrkKoB5DLLSugqQ6HjHHwYB2IBE+ka82dPDHa3lwi2YSu3kjjAVqFtF lwPtHv9XmzkHxZ3+fEaqYQaAZTz9PZcwqK9PCzRT56JJAv99BMhMxS4pqY/3Rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652727603; a=rsa-sha256; cv=none; b=R69JB2ackyegdZ/X4lloHxr/LA0iOB5Bcj1oEz7crFt4uIwstcK1kZExbY4/Tx4pI78Efe QB8hvHvKx87eypa0E6uNpxmAyitGNz8QzYzdw1IVW8nMkMYm6AlUvshl19c/ANlKlWnQk9 7AUaciy6wgPol31HIpl0/7wGQU1hkpyvlOyWee5CQez+hHhyxYyXqhjSTYLI7raDso6zMy atEcn8lWkdPWMmufXC5evIRTz7lqFIOrmqOxwEf3SPCMfuUvKC15ItX4nyZ7IdN5kmcHNN /NHonBq2wnQMk+8T4BpUau/64UL2S775e5WaiLnM1kZ9YDeQgUPKXwO+HbxgXA== 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=78989b4e694c2a8264975fb6d64e3bf1c13762c2 commit 78989b4e694c2a8264975fb6d64e3bf1c13762c2 Author: Robert Clausecker AuthorDate: 2022-05-16 15:00:32 +0000 Commit: Adriaan de Groot CommitDate: 2022-05-16 18:57:54 +0000 multimedia/nymphcast: fix build on ARMv7 nymphcast has a bundled copy of angelscript (TODO: use the one from ports instead) that doesn't build nicely on ARM because it passes in invalid compiler flags. PR: 263953 Reported by: Robert Clausecker --- multimedia/nymphcast/Makefile | 1 + multimedia/nymphcast/files/patch-armv7 | 58 ++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/multimedia/nymphcast/Makefile b/multimedia/nymphcast/Makefile index 03d14fed7298..6577b830fbf3 100644 --- a/multimedia/nymphcast/Makefile +++ b/multimedia/nymphcast/Makefile @@ -1,5 +1,6 @@ PORTNAME= NymphCast DISTVERSION= v0.1 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= adridg@FreeBSD.org diff --git a/multimedia/nymphcast/files/patch-armv7 b/multimedia/nymphcast/files/patch-armv7 new file mode 100644 index 000000000000..38dda98732cc --- /dev/null +++ b/multimedia/nymphcast/files/patch-armv7 @@ -0,0 +1,58 @@ +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 +