From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E0838158086 for ; Sat, 4 Dec 2021 00:54:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1D212BC014; Sat, 4 Dec 2021 00:54:32 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C26D82BC014 for ; Sat, 4 Dec 2021 00:54:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 871FF343361 for ; Sat, 4 Dec 2021 00:54:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DFEA0210 for ; Sat, 4 Dec 2021 00:54:29 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1638579258.8c4513365769fad2735d1b8403352506fe4a12b2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/blender/blender-3.0.0.ebuild media-gfx/blender/blender-9999.ebuild X-VCS-Directories: media-gfx/blender/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8c4513365769fad2735d1b8403352506fe4a12b2 X-VCS-Branch: master Date: Sat, 4 Dec 2021 00:54:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ec99cb6e-07b6-435e-a7e6-7a8ecf6402b7 X-Archives-Hash: 4c6e63766d955197b04f7b2af450f907 commit: 8c4513365769fad2735d1b8403352506fe4a12b2 Author: Sam James gentoo org> AuthorDate: Sat Dec 4 00:53:16 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Dec 4 00:54:18 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c451336 media-gfx/blender: don't force gold linker if GCC is detected We prefer to let the user choose their linker. Signed-off-by: Sam James gentoo.org> media-gfx/blender/blender-3.0.0.ebuild | 10 ++++++++++ media-gfx/blender/blender-9999.ebuild | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/media-gfx/blender/blender-3.0.0.ebuild b/media-gfx/blender/blender-3.0.0.ebuild index 24ae03343e86..ad4ed0c1d319 100644 --- a/media-gfx/blender/blender-3.0.0.ebuild +++ b/media-gfx/blender/blender-3.0.0.ebuild @@ -263,8 +263,18 @@ src_configure() { -DWITH_USD=OFF -DWITH_XR_OPENXR=OFF ) + append-flags $(usex debug '-DDEBUG' '-DNDEBUG') + if tc-is-gcc ; then + # These options only exist when GCC is detected. + # We disable these to respect the user's choice of linker. + mycmakeargs+=( + -DWITH_LINKER_GOLD=OFF + -DWITH_LINKER_LLD=OFF + ) + fi + cmake_src_configure } diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index 48b72fc65808..1ee78855efed 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -263,8 +263,18 @@ src_configure() { -DWITH_USD=OFF -DWITH_XR_OPENXR=OFF ) + append-flags $(usex debug '-DDEBUG' '-DNDEBUG') + if tc-is-gcc ; then + # These options only exist when GCC is detected. + # We disable these to respect the user's choice of linker. + mycmakeargs+=( + -DWITH_LINKER_GOLD=OFF + -DWITH_LINKER_LLD=OFF + ) + fi + cmake_src_configure }