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 57CFE15810F for ; Mon, 5 Jun 2023 11:05:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22689E08BE; Mon, 5 Jun 2023 11:05:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 02E42E08BE for ; Mon, 5 Jun 2023 11:05:21 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0745A33BE3F for ; Mon, 5 Jun 2023 11:05:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E3EC8DC for ; Mon, 5 Jun 2023 11:05:19 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1685963070.f26f5d09fec69b7e46995f1cc858177ec0dd2d0f.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/smc-sum/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/smc-sum/smc-sum-2.10.0.20221209-r1.ebuild sys-apps/smc-sum/smc-sum-2.10.0.20221209-r2.ebuild X-VCS-Directories: sys-apps/smc-sum/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: f26f5d09fec69b7e46995f1cc858177ec0dd2d0f X-VCS-Branch: master Date: Mon, 5 Jun 2023 11:05:19 +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: 620ee03a-9d2a-4149-9d2e-2e5a936e597f X-Archives-Hash: 8881ca3322e590b9cb3f98bad9da36e4 commit: f26f5d09fec69b7e46995f1cc858177ec0dd2d0f Author: Conrad Kostecki gentoo org> AuthorDate: Mon Jun 5 11:01:50 2023 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Mon Jun 5 11:04:30 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f26f5d09 sys-apps/smc-sum: fix build without module Closes: https://bugs.gentoo.org/907697 Signed-off-by: Conrad Kostecki gentoo.org> ...209-r1.ebuild => smc-sum-2.10.0.20221209-r2.ebuild} | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/sys-apps/smc-sum/smc-sum-2.10.0.20221209-r1.ebuild b/sys-apps/smc-sum/smc-sum-2.10.0.20221209-r2.ebuild similarity index 83% rename from sys-apps/smc-sum/smc-sum-2.10.0.20221209-r1.ebuild rename to sys-apps/smc-sum/smc-sum-2.10.0.20221209-r2.ebuild index 232195afedd7..366de02b72d7 100644 --- a/sys-apps/smc-sum/smc-sum-2.10.0.20221209-r1.ebuild +++ b/sys-apps/smc-sum/smc-sum-2.10.0.20221209-r2.ebuild @@ -3,6 +3,8 @@ EAPI=8 +MODULES_OPTIONAL_IUSE="+module" + inherit linux-mod-r1 MY_DATE="$(ver_cut 4)" @@ -46,23 +48,19 @@ src_prepare() { # Install new Makefile to respect users CFLAGS and LDFLAGS cp "${FILESDIR}"/makefile driver/Source/Linux/Makefile || die - use module && linux-mod-r1_pkg_setup + linux-mod-r1_pkg_setup } src_compile() { - if use module; then - local modargs=( KDIR="${KV_OUT_DIR}" ) - local modlist=( sum_bios="misc:driver/Source/Linux" ) - - linux-mod-r1_src_compile - else - :; - fi + local modargs=( KDIR="${KV_OUT_DIR}" ) + local modlist=( sum_bios="misc:driver/Source/Linux" ) + + linux-mod-r1_src_compile } src_install() { newbin sum smc-sum einstalldocs - use module && linux-mod-r1_src_install + linux-mod-r1_src_install }