From nobody Fri Oct 21 17:27:12 2022 X-Original-To: dev-commits-src-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 4MvBH96d8Dz4gGVZ; Fri, 21 Oct 2022 17:27:17 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from fry.fubar.geek.nz (fry.fubar.geek.nz [139.59.165.16]) by mx1.freebsd.org (Postfix) with ESMTP id 4MvBH72k6Sz46nR; Fri, 21 Oct 2022 17:27:15 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from smtpclient.apple (cpc91214-cmbg18-2-0-cust234.5-4.cable.virginm.net [81.102.75.235]) by fry.fubar.geek.nz (Postfix) with ESMTPSA id C92CF4E701; Fri, 21 Oct 2022 17:27:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fubar.geek.nz; s=mail; t=1666373234; bh=tbczsVuyRlNdc5yhvPy9IvWaXAlr9KaJ72gHHPLpb3U=; h=Subject:From:In-Reply-To:Date:Cc:References:To; b=JfSRvpjR0vxKUcd+C0hhCrRIylMCtHNqakPm596AVFUhAw8IUHPm1LYUVD+pOCnQM dJ3Ft0OKa7YEPIMHapYLFOBMoVXpTRt9DGhtl0VzjnxenWfzrySiu4yrj35Fg5KTDS SMnLWZgwsAwakJY2WrgX/jAjNo2S13MfTsrHhDhbjCnbduIJJcSTnA+9STke4KneNW TbQboOHAjdz6oW20HFwzoeTRCiW+0L+3KytFspWtgNSSb1HDtqXOG06kKk9DdgdQhQ m6YDcl6EJu+fDEchg4fBYMQjs7jcaDuoFVlqnI8cZq5AZDXPtYYHZ9RLuoCRCrbvTG DJGoRnPwmFPkjOM+KMNZiwwKJhYPmqt66lqM7WL1bmNO5522Bu5xL5gOk7ZUrEcMan qVxj/ThwoaaO4s8milawEJhIgbdlpHvPK9teEO4CSG5IzGPuoCv/GXp3NJZ7FDnwyd HMO4Ke4CCzFlBRhyDI/A9GghgHRzvnKXVnjtZYwWnVWzkymo2O7Fwl8FibBkoFEbn7 gWL3T3zXP7Cknt7fWblruth5+wfJ66JwXdorrotFnccJ0LJ0YnRcjPbD4boY75fWyX DxSENWpjoM1U6cgXPJ/nX53D4P+Tm3jOhL3knx6ZF/Ga1Lp1IFIkDlBv8t1o76IgKU z8ZZMODpDNtnqEqdd10VHLTM= Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: Re: git: 2782ed8f6cd3 - main - dpaa2: fix standalone module build From: Andrew Turner In-Reply-To: <8sps479n-9961-rq8o-52op-po77rpo9p377@mnoonqbm.arg> Date: Fri, 21 Oct 2022 18:27:12 +0100 Cc: Gleb Smirnoff , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <90B2F15A-3102-4771-BD46-C5304091569C@fubar.geek.nz> References: <202210180540.29I5eNBZ068087@gitrepo.freebsd.org> <8sps479n-9961-rq8o-52op-po77rpo9p377@mnoonqbm.arg> To: "Bjoern A. Zeeb" X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Rspamd-Queue-Id: 4MvBH72k6Sz46nR X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=fubar.geek.nz header.s=mail header.b=JfSRvpjR; dmarc=pass (policy=none) header.from=fubar.geek.nz; spf=softfail (mx1.freebsd.org: 139.59.165.16 is neither permitted nor denied by domain of andrew@fubar.geek.nz) smtp.mailfrom=andrew@fubar.geek.nz X-Spamd-Result: default: False [0.30 / 15.00]; VIOLATED_DIRECT_SPF(3.50)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW_WITH_FAILURES(-0.50)[]; MV_CASE(0.50)[]; R_DKIM_ALLOW(-0.20)[fubar.geek.nz:s=mail]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; FREEFALL_USER(0.00)[andrew]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; MIME_TRACE(0.00)[0:+]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; R_SPF_SOFTFAIL(0.00)[~all]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ASN(0.00)[asn:14061, ipnet:139.59.160.0/20, country:US]; RCPT_COUNT_FIVE(0.00)[5]; DMARC_POLICY_ALLOW(0.00)[fubar.geek.nz,none]; DKIM_TRACE(0.00)[fubar.geek.nz:+]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N > On 21 Oct 2022, at 16:17, Bjoern A. Zeeb wrote: >=20 > On Tue, 18 Oct 2022, Gleb Smirnoff wrote: >=20 >> The branch main has been updated by glebius: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2782ed8f6cd3d7f59219a783bc7fa7bb= fb1fe26f >>=20 >> commit 2782ed8f6cd3d7f59219a783bc7fa7bbfb1fe26f >> Author: Gleb Smirnoff >> AuthorDate: 2022-10-18 05:38:24 +0000 >> Commit: Gleb Smirnoff >> CommitDate: 2022-10-18 05:38:24 +0000 >>=20 >> dpaa2: fix standalone module build >> --- >> sys/modules/dpaa2/Makefile | 2 ++ >> 1 file changed, 2 insertions(+) >>=20 >> diff --git a/sys/modules/dpaa2/Makefile b/sys/modules/dpaa2/Makefile >> index 556a1c531669..fa280452bcfa 100644 >> --- a/sys/modules/dpaa2/Makefile >> +++ b/sys/modules/dpaa2/Makefile >> @@ -19,6 +19,8 @@ SRCS+=3D memac_mdio_common.c memac_mdio_if.c = memac_mdio_if.h >>=20 >> SRCS+=3D bus_if.h device_if.h miibus_if.h >> SRCS+=3D pcib_if.h pci_if.h >> +SRCS+=3D mdio_if.h >=20 > What do you need this for? >=20 >> +SRCS+=3D opt_acpi.h opt_platform.h >=20 > opt_acpi gets inlcuded lines below and so does opt_platform under the > respective OPT_ checks. Now they are there twice. OPT_ACPI doesn=E2=80=99t exist as a make variable so the ".if = !empty(OPT_ACPI)=E2=80=9D check won=E2=80=99t work as it is expected to = work here so opt_acpi.h won=E2=80=99t be built. The second problem is = the opt_*.h files need to be unconditionally created so they can be = included in the relevant code. >>=20 >> .if !empty(OPT_ACPI) >> SRCS+=3D dpaa2_mc_acpi.c \ >>=20 Andrew