From nobody Mon Sep 12 16:38:06 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 4MRC2Q2QGsz4bhkm; Mon, 12 Sep 2022 16:38:06 +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 4MRC2Q1tTtz3Gl0; Mon, 12 Sep 2022 16:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663000686; 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=C6HFhBoYWR8sUPf5rw+FsODKTWlB4MrJA5zdZ9vyA/M=; b=KXwOnpcQhSVk7gNkJEdZqe+DtlMF9ESwAgDWjbK2IBCpjeaiYeLipU5mDhdGLbMG6jF/NK IUC13ixEUR6/sKd9zwmxu7oQgVYMz9KdBuvYycryCAZzgvTSGkAn/B0DKA9Iy01iehWptK ZY0qb+dH6x4sMf2gUFtvxWL52mj1iin3R1zFOdZ3RCsOtMVxOFPeuWXPDBvSmuvGT+odq0 uoDjXjqKBKqw4TZEJru+zo6QSW2+VbVj328fC9Xqlhhv6uncaxjSLeR20nUqLdMCdRnizb IlzrluVXciz9V0P/YSHjk2q6MpbI2P9XMLPHyrwZVNpqDCrG3FZlx+FuH0GZtg== 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 4MRC2Q0xX6z139x; Mon, 12 Sep 2022 16:38:06 +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 28CGc6jK076903; Mon, 12 Sep 2022 16:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28CGc6Ih076902; Mon, 12 Sep 2022 16:38:06 GMT (envelope-from git) Date: Mon, 12 Sep 2022 16:38:06 GMT Message-Id: <202209121638.28CGc6Ih076902@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: fde73a13c618 - main - graphics/filament: Fix build when ccache is present 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fde73a13c618cce1b2ee3324c25f2c424c3ab94d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663000686; 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=C6HFhBoYWR8sUPf5rw+FsODKTWlB4MrJA5zdZ9vyA/M=; b=YdgpKH2a4WN4k7uHGHJGaewXwjyhJPQxHOwkG5JeQMXXfhx6sn1V86+rKOYALdCmOCTQm7 NImfOiTnDjujPlclq6TFakEqHKZJ17uR0J1aLQ0XZ1CAINw2Y8pQca0PvH94ykdmdmChH1 HuGbvbbSq4BatPZ4osF0uUbUqvF07lxOO71v3VJGdsN+D/PWDScjH6CMGfaN7s01O5sYYe 2b31RdJFqQzLr24aKlm2Tl/RB614mQ+Lw98mYQbWXx4iaPsudnyEa/bQ75ceSSIA6QD+Qu RflHzteAxGV6L5+6hjukZkkqXkVNVPHwVLmnz85LTLa8eCpgj8xg/gRan8ksbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663000686; a=rsa-sha256; cv=none; b=MRf3YZoAhucDslkI4Zi5dRzrxOzWWizJ9MegA+1UUdGD+Gk+7FRsEcY9sA8UsB6I0PcbYC nPkMBwRVSod7mg7oO+Vl6epkUtIM9GU+Dg+EcKneLYFUXhKv6NoIGnI8Sj9cH8U3RnR+Pz J0HU4Kx3Ngb1AaMIqFH+rsoiC+i10c4eCB0UJx6u8jE3pMfGDsz3von7xWEuAI0d/7CogQ 6W2iy1oxp1WjT+GQs0pTsgRGlKvHMjm4FbE/0R7KJL/OV9gYUf9iWxq5L81winiNY1cL/z LYIx+Clb1S3M3+93WGn+HV1aH3m3yOHjGKtbK3ONMK7rPR6sURzO73HOz78aVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=fde73a13c618cce1b2ee3324c25f2c424c3ab94d commit fde73a13c618cce1b2ee3324c25f2c424c3ab94d Author: Yuri Victorovich AuthorDate: 2022-09-12 16:32:54 +0000 Commit: Yuri Victorovich CommitDate: 2022-09-12 16:38:03 +0000 graphics/filament: Fix build when ccache is present Fix shabangs in ccache scripts that fialement uses. This caused failures. Also: this project looks up the ccache program and uses ccach. when it is present. This logic is now adjusted and it only uses ccache when it is enabled through the ports framework. PR: 266297 Reported by: amdmi3@ --- graphics/filament/Makefile | 5 ++++- graphics/filament/files/patch-CMakeLists.txt | 11 ++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/graphics/filament/Makefile b/graphics/filament/Makefile index 4fc6f4584900..242fd880ad33 100644 --- a/graphics/filament/Makefile +++ b/graphics/filament/Makefile @@ -15,16 +15,19 @@ BROKEN_i386= compilation breaks: register r11 is only available in 64-bit mode BUILD_DEPENDS= bash:shells/bash \ evdev-proto>0:devel/evdev-proto -USES= cmake compiler:c++17-lang localbase:ldflags sdl xorg +USES= cmake compiler:c++17-lang localbase:ldflags sdl shebangfix xorg USE_SDL= sdl2 USE_XORG= x11 USE_GITHUB= yes GH_ACCOUNT= google +SHEBANG_FILES= build/launch-c.in build/launch-cxx.in + #CMAKE_ON= BUILD_SHARED_LIBS # not yet supported, see https://github.com/google/filament/issues/1075 CMAKE_OFF= USE_STATIC_LIBCXX FILAMENT_ENABLE_JAVA CMAKE_ARGS+= -DDIST_DIR="." # prevent subdirectory for libraries +CMAKE_ARGS+= -DUSE_CCACHE:BOOL=${CCACHE_ENABLED:tu} LDFLAGS+= -lexecinfo -lSDL2 diff --git a/graphics/filament/files/patch-CMakeLists.txt b/graphics/filament/files/patch-CMakeLists.txt index fac357ef46bd..c6ad0a518526 100644 --- a/graphics/filament/files/patch-CMakeLists.txt +++ b/graphics/filament/files/patch-CMakeLists.txt @@ -1,5 +1,14 @@ ---- CMakeLists.txt.orig 2022-08-18 20:34:20 UTC +--- CMakeLists.txt.orig 2022-08-31 16:04:08 UTC +++ CMakeLists.txt +@@ -66,7 +66,7 @@ endif() + # Support for ccache + # ================================================================================================== + find_program(CCACHE_PROGRAM ccache) +-if (CCACHE_PROGRAM) ++if (USE_CCACHE AND CCACHE_PROGRAM) + set(C_LAUNCHER "${CCACHE_PROGRAM}") + set(CXX_LAUNCHER "${CCACHE_PROGRAM}") + @@ -99,6 +99,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # ================================================================================================== if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT WEBGL)