Bug 250502 - graphics/mesa-dri Patching breaks on FreeBSD 11
Summary: graphics/mesa-dri Patching breaks on FreeBSD 11
Status: Open
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: freebsd-x11 (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-10-21 07:58 UTC by Stewart Morgan
Modified: 2020-10-22 17:26 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (x11)


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Stewart Morgan 2020-10-21 07:58:41 UTC
Hello,
	As of revision 552109, this fails at the patching stage for FreeBSD 11 (well, anything less than 12) due to the addition of the the following:

.if ${OSVERSION} < 1200000
	 EXTRA_PATCHES+= ${PATCHDIR}/extra-src_util_build__id.c
.endif

	There is a ***patch***-src_util_build__id.c in the files directory, which also contains a "__FreeBSD__ < 12" test; was this file supposed to be renamed?

Thanks,
Stewart.
Comment 1 Niclas Zeising freebsd_committer 2020-10-21 19:05:02 UTC
Hi!
While you are probably right in that the file should be renamed, I can't reproduce any build failure, and there has been no reports of it from the cluster either.
The patch will be applied for all builds, but it is not having any effect on FreeBSD >= 12, so I'll leave it as-is for now, and I'll add it to the list of things to look att for the next mesa update.
Regards
Comment 2 Stewart Morgan 2020-10-22 08:10:25 UTC
(In reply to Niclas Zeising from comment #1)
Hi,
Thanks for responding!

I presume the cluster isn't building under 11.x regularly?  The only place the build fails for me is within my FreeBSD 11.4 poudriere jail when that Makefile-conditional kicks in and make/patch rightly complains it can't find the nonexistant ${PATCHDIR}/extra-src_util_build__id.c file.  

For when you next look at this, I'd humbly suggest the solution is to either:
a) rename the patch-file so it is only applied, via the Makefile's conditional,  where it has an effect (FreeBSD < 12) — bonus points maybe to remove the then-redundant conditional within the patch-file too :)
b) remove the Makefile conditional and rely solely on the patch-file's conditional

Thanks,
Stewart.
Comment 3 Niclas Zeising freebsd_committer 2020-10-22 10:59:38 UTC
11.4 packages are regularly built (although I don't know the exact schedule).  I had no problems building this in my 11.4 jail locally as well.
Comment 4 rkoberman 2020-10-22 17:26:38 UTC
(In reply to Stewart Morgan from comment #2)
11.4 runs for amd64 were last completed today. They may not have reached the mirrors yet. 

It's purely coincidental that both the quarterly and head completed on the same day. Quarterly runs typically take only a few hours, but head can take two or three days, depending on what ports need to be rebuilt.