Page MenuHomeFreeBSD

libucl: Revert to old behavior of macros
ClosedPublic

Authored by bofh on Tue, Apr 7, 6:29 PM.

Details

Summary

Enable macros and includes by default as this is breaking package
building on HEAD.

Reported by: ivy
Fixes: abda442d92fd ("contrib/libucl: Import libucl 0.9.3")

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

bofh requested review of this revision.Tue, Apr 7, 6:29 PM

i think we need this for now, but we should back it out at some point to return to the upstream behaviour -- my preference would be after 15.0 is EOL (September), unless anyone prefers another plan.

This revision is now accepted and ready to land.Tue, Apr 7, 6:31 PM

I have tried to revert the default behavior only. @ivy Can you check if this helps? Somehow my local head in the office is in a messy stage and I cannot complete a buildworld.

If this does not help then we will revert the libucl upgrade.

i'll run a test build now and let you know (this takes a couple of hours).

In D56294#1288035, @ivy wrote:

i think we need this for now, but we should back it out at some point to return to the upstream behaviour -- my preference would be after 15.0 is EOL (September), unless anyone prefers another plan.

We will think about that bridge when we need to cross that river. But for now I am no longer pushing my staged 0.9.4.

In D56294#1288039, @ivy wrote:

i'll run a test build now and let you know (this takes a couple of hours).

I hope to return home by that time. Happy building.

In D56294#1288035, @ivy wrote:

i think we need this for now, but we should back it out at some point to return to the upstream behaviour -- my preference would be after 15.0 is EOL (September), unless anyone prefers another plan.

We will think about that bridge when we need to cross that river. But for now I am no longer pushing my staged 0.9.4.

I think my only concern here is that we commit to no sooner than 15.0 EOL, and that we do note to revisit it later. The reality is that this small local diff is unlikely to cause you any heartburn in future libucl updates, and our flua consumers are both few and aware of the caveat.

tested:

  • build latest releng/15.0 on current main, update-packages fails
  • apply this patch to the host, rebuild and upgrade
  • build releng/15.0 again, this time it works

so this all looks fine.