Date: Wed, 28 Jul 2021 10:17:17 +0200 From: Piotr Kubaj <pkubaj@anongoth.pl> To: Emmanuel Vadot <manu@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: f74b56360de7 - main - graphics/mesa-*: Unbreak on 11.4 Message-ID: <YQESjToRrC5MQLAI@KGPE-D16> In-Reply-To: <202107280712.16S7CKYr031066@gitrepo.freebsd.org> References: <202107280712.16S7CKYr031066@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--HkKKR0fgORF6HjY3 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 21-07-28 07:12:20, Emmanuel Vadot wrote: > The branch main has been updated by manu: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3Df74b56360de7b82aa5135be3= 06cdfacb3db3acd0 >=20 > commit f74b56360de7b82aa5135be306cdfacb3db3acd0 > Author: Emmanuel Vadot <manu@FreeBSD.org> > AuthorDate: 2021-07-28 07:12:07 +0000 > Commit: Emmanuel Vadot <manu@FreeBSD.org> > CommitDate: 2021-07-28 07:12:07 +0000 >=20 > graphics/mesa-*: Unbreak on 11.4 > =20 > Re-add patches that was removed on the 21.1.5 update. > =20 > PR: 257305 > --- > graphics/mesa-dri/Makefile.common | 4 ++++ > graphics/mesa-dri/files/extra-patch-src_util_build__id.c | 15 ++++++++++= +++++ > graphics/mesa-libs/Makefile | 2 -- > 3 files changed, 19 insertions(+), 2 deletions(-) >=20 > diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefi= le.common > index 20931bf44980..36ba47ccbe30 100644 > --- a/graphics/mesa-dri/Makefile.common > +++ b/graphics/mesa-dri/Makefile.common > @@ -81,6 +81,10 @@ PKGHELP=3D ${.CURDIR}/pkg-help > PKGINSTALL=3D ${.CURDIR}/pkg-install > PKGDEINSTALL=3D ${.CURDIR}/pkg-deinstall > =20 > +.if ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} < 1200000 > +EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-src_util_build__id.c > +.endif > + > .include <bsd.port.pre.mk> > =20 > BINARY_ALIAS+=3D python3=3D${PYTHON_VERSION} > diff --git a/graphics/mesa-dri/files/extra-patch-src_util_build__id.c b/g= raphics/mesa-dri/files/extra-patch-src_util_build__id.c > new file mode 100644 > index 000000000000..4b7b69d6b8ee > --- /dev/null > +++ b/graphics/mesa-dri/files/extra-patch-src_util_build__id.c > @@ -0,0 +1,15 @@ > +# Elf_ doesn't exist, use Elf32_ or Elf64_ > +# > +--- src/util/build_id.c.orig 2017-12-21 17:31:22 UTC > ++++ src/util/build_id.c > +@@ -38,6 +38,10 @@ > + #define ElfW(type) Elf_##type > + #endif > +=20 > ++#if defined(__FreeBSD__) && __FreeBSD__ < 12 > ++typedef Elf_Note Elf_Nhdr; > ++#endif Why check for version here when the check is already done in the Makefile? > ++ > + struct build_id_note { > + ElfW(Nhdr) nhdr; > +=20 > diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile > index 858a91d7472f..7d759b34ca81 100644 > --- a/graphics/mesa-libs/Makefile > +++ b/graphics/mesa-libs/Makefile > @@ -6,8 +6,6 @@ CATEGORIES=3D graphics > =20 > COMMENT=3D OpenGL libraries that support GLX and EGL clients > =20 > -BROKEN_FreeBSD_11=3D error: unknown type name 'Elf_Nhdr' > - > BUILD_DEPENDS=3D libglvnd>0:graphics/libglvnd > =20 > OPTIONS_GROUP=3D PLATFORM --HkKKR0fgORF6HjY3 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEycyIeNkkgohzsoorelmbhSCDnJ0FAmEBEo0ACgkQelmbhSCD nJ2lYw//WHItv8FXi8/oYOTbc694sTZLUqxrzxgmDHsd4NOtJaTo6gE+6rHjLwtr ii5G/Lt0IvUclrB7YyUszpM6nPZs7tZqlVZzh8H2L3IaP26o/qTQXfdVdzs3/6ya R1H5tRVHPl/QEj7zGef9EVGbK6G9hLQ1v/Ub+oa2kX0pgBy1owVvRrPfu4dBe74L inTGN+7ayDUVXw9/Hejttr+3L2p0KiRDYnv0kSXhWf3C48lqE1DjEl+wMNw96EmB dFURTTg7nxRpHAU7ozbL42T0sLuJrkqsjTMwOkhxPpuFwNwTwWMP7AGucoXvwHxh dgM59GwUf+S2nySw6UoR/VwLq3M9eh+0DZ3Msly2f+6lOC1CpEv4Wv4BvMis4M8D aDT60ixA3Q/fPLFsGlydcrtaSyU2bT4RYzj5al5QTQiwf5HDPNCfSbNr6s/jDM+T ofEdWFRzy7pd1M/ATLHJCdeJR3tP1oH2+38m9Gci05m5xsEcUqzRhyD54NbHoWLp H7wNl3HHPkMmeyvuAHqzHLB7ZM9T83DOOXFasCX+J8BKtTN5Z2jOjElMpKU5jPD1 oOpOrliozgPFt2UXRCpICNUKb7UJ2FtFXeDvhfXgNqlJAsFtmAZWB8MOtGhoIlNX GHoU3EfzqvWO+uQR94N1P41PRbMenfvM44cf4sieweLTrqdIqwA= =zMrz -----END PGP SIGNATURE----- --HkKKR0fgORF6HjY3--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YQESjToRrC5MQLAI>