Date: Thu, 17 Aug 2023 20:00:00 +0200 From: Felix Palmen <zirias@freebsd.org> To: ports@freebsd.org Subject: Re: plist-check not reporting orphaned files present in a @comment Message-ID: <b6vnwizkwizfvramyt7wpptrxxwbhlix4ng6ln5taeisdlwis3@3zxypt5bz6ml> In-Reply-To: <SI2PR01MB5036417FFC955DC05AAB95D3FA1AA@SI2PR01MB5036.apcprd01.prod.exchangelabs.com> References: <5h3c6jbzs7y5k3hyimqn7jkyo3se3txvcywahpcffzc24hjew7@kx4mhnqq7gh4> <8raa-vofq-wny@FreeBSD.org> <2ppfted4t72jo2bhgxfmoghpm6zukhrcqevucxvouqqwehwugg@zy4chydjtuxy> <67hyj5pbnd2hf66tdj2szrtyhxozmjjcevw5rooas2vzrltxna@oqjzi7m5tfho> <SI2PR01MB50367346DECCA8B8A4FC29FDFA15A@SI2PR01MB5036.apcprd01.prod.exchangelabs.com> <yccoastr67igymrpia64kkxofded42fzrcboc4fmvwbn4uop4f@ug5j362pkjgr> <SI2PR01MB5036417FFC955DC05AAB95D3FA1AA@SI2PR01MB5036.apcprd01.prod.exchangelabs.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--sr3tnaikp2o2c3xk
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
* Tatsuki Makino <tatsuki_makino@hotmail.com> [20230817 17:14]:
> Felix Palmen wrote on 2023/08/17 15:03:
> > It is, when some file doesn't exist for all architectures, but for more
> > than one of them.
> >=20
> > You first test the port on ARCH=3Dfoo. Then you test on ARCH=3Dbar and =
find
> > that it builds/installs an additional tmp/something, so you prefix it
> > with %%BAR%% which expands to "@comment " unless building on ARCH=3Dbar.
> >=20
> > Then you test on ARCH=3Dbaz which happens to build/install the same
> > tmp/something. plist-check will still be happy because the file is there
> > in pkg-plist (ignoring the @comment). Still, the file will be missing
> > from the package.
> >=20
> > I might try another workaround, e.g. expand to "@comment dummy/"
> > instead, so the name won't match and plist-check will complain ...
>=20
> epson-inkjet-printer-escpr2 is easy because it is restricted to 2 archite=
ctures, but in general it seems difficult.
> How about also making a combined PLIST_SUB in Makefile?
JFTR, this wasn't my problem here. In my concrete scenario, there are
only 3 supported archs anyways (I'm building a Linux-native toolchain
=66rom source for the Linuxulator, will present it on this list once it
works on all 3 archs), and I already define NO_* subs, so it's straight
forward to set anything that might be required in pkg-plist.
The issue really was just about plist-check, which will *not* report
"orphaned" files when they are present in some @comment...
I now got around the issue using *this* block in my ports:
#v+
=2Einclude <bsd.port.options.mk>
=2Eif ${ARCH} =3D=3D amd64
PLIST_SUB+=3D AMD64=3D"" NO_AMD64=3D"@comment _nonexisting/"
=2Eelse
PLIST_SUB+=3D AMD64=3D"@comment _nonexisting/" NO_AMD64=3D""
=2Eendif
=2Eif ${ARCH} =3D=3D aarch64
PLIST_SUB+=3D AARCH64=3D"" NO_AARCH64=3D"@comment _nonexisting/"
=2Eelse
PLIST_SUB+=3D AARCH64=3D"@comment _nonexisting/" NO_AARCH64=3D""
=2Eendif
=2Eif ${ARCH} =3D=3D i386
PLIST_SUB+=3D I386=3D"" NO_I386=3D"@comment _nonexisting/"
=2Eelse
PLIST_SUB+=3D I386=3D"@comment _nonexisting/" NO_I386=3D""
=2Eendif
#v-
Sure, it's somewhat dirty workaround, but adding some "dummy" prefix to
the files makes sure plist-check will complain about them ;)
--=20
Felix Palmen <zirias@FreeBSD.org> {private} felix@palmen-it.de
-- ports committer -- {web} http://palmen-it.de
{pgp public key} http://palmen-it.de/pub.txt
{pgp fingerprint} 6936 13D5 5BBF 4837 B212 3ACC 54AD E006 9879 F231
--sr3tnaikp2o2c3xk
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iNUEABYKAH0WIQRpNhPVW79IN7ISOsxUreAGmHnyMQUCZN5f+F8UgAAAAAAuAChp
c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0Njkz
NjEzRDU1QkJGNDgzN0IyMTIzQUNDNTRBREUwMDY5ODc5RjIzMQAKCRBUreAGmHny
Mcw0AQCbOEGP1OUm4UU3rkwUei0QZ41TRPhw5tZYF0z3hLb8NAD/bZdSH+Dm3tZx
deuZrnFBxFhXve+EMZpHFhK/TRVQoww=
=wUka
-----END PGP SIGNATURE-----
--sr3tnaikp2o2c3xk--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?b6vnwizkwizfvramyt7wpptrxxwbhlix4ng6ln5taeisdlwis3>