Date: Fri, 21 Oct 2022 18:27:12 +0100 From: Andrew Turner <andrew@fubar.geek.nz> To: "Bjoern A. Zeeb" <bz@FreeBSD.org> Cc: Gleb Smirnoff <glebius@FreeBSD.org>, "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: 2782ed8f6cd3 - main - dpaa2: fix standalone module build Message-ID: <90B2F15A-3102-4771-BD46-C5304091569C@fubar.geek.nz> In-Reply-To: <8sps479n-9961-rq8o-52op-po77rpo9p377@mnoonqbm.arg> References: <202210180540.29I5eNBZ068087@gitrepo.freebsd.org> <8sps479n-9961-rq8o-52op-po77rpo9p377@mnoonqbm.arg>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 21 Oct 2022, at 16:17, Bjoern A. Zeeb <bz@FreeBSD.org> 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 <glebius@FreeBSD.org> >> AuthorDate: 2022-10-18 05:38:24 +0000 >> Commit: Gleb Smirnoff <glebius@FreeBSD.org> >> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?90B2F15A-3102-4771-BD46-C5304091569C>