Page MenuHomeFreeBSD
Differential D18567

x11/polybar: fix build on 13-CURRENT
ClosedPublic
Actions

Authored by rigoletto on Dec 15 2018, 2:02 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Feb 10, 8:32 PM
Unknown Object (File)
Jan 12 2025, 7:29 AM
Unknown Object (File)
Jan 4 2025, 5:47 AM
Unknown Object (File)
Dec 14 2024, 1:48 AM
Unknown Object (File)
Dec 14 2024, 12:42 AM
Unknown Object (File)
Dec 3 2024, 3:15 PM
Unknown Object (File)
Nov 29 2024, 7:36 PM
Unknown Object (File)
Nov 24 2024, 6:24 AM
View All Files
Subscribers
None

Details

Reviewers
mat
tcberner
Commits
rP487818: x11/polybar: fix build on 13-CURRENT.
Summary

Polybar is broken on CURRENT. I don't have a CURRENT box but I managed to reproduce the breakage on 12R forcing llvm70 on it.

I set the port to use llvm60, but is there a way to just a apply those changes on 13, to avoid the need of build llvm60 when there is no actual necessity? I mean, like a helper or something. I think I already saw something for that in the handbook but I am not finding it now.

Test Plan

Needs test on a CURRENT box.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

rigoletto created this revision.Dec 15 2018, 2:02 AM
rigoletto edited the summary of this revision. (Show Details)Dec 15 2018, 2:02 AM
rigoletto edited the test plan for this revision. (Show Details)
Harbormaster completed remote builds in B21580: Diff 52038.Dec 15 2018, 2:04 AM
tcberner added a comment.Dec 15 2018, 6:32 AM

Could you try to fix the build with clang7? What is the error you get?

x11/polybar/Makefile
19 ↗(On Diff #52038)

^ there should be a connection between the 60 here and below

39 ↗(On Diff #52038)

^ I would not misues LLVM_DEFAULT for this :)

rigoletto updated this revision to Diff 52059.Dec 15 2018, 6:13 PM
rigoletto marked 2 inline comments as done.
  • fix BUILD_DEPENDS
  • remove LLVM_DEFAULT
  • apply the changes just to CURRENT
Harbormaster completed remote builds in B21590: Diff 52059.Dec 15 2018, 6:13 PM
rigoletto updated this revision to Diff 52060.Dec 15 2018, 6:19 PM

Minor, just remove an extra "+".

Btw, the OSVERSION is ate the end because was portlint compling about bsd.port.pre.mk before OPTIONS.

Thanks!

Harbormaster completed remote builds in B21591: Diff 52060.Dec 15 2018, 6:19 PM
tcberner added a comment.Dec 15 2018, 6:24 PM

Could you check whether https://github.com/jaagr/polybar/commit/3b32f5899a4d9a0bcb49099ee4bfee750366a3e6.patch would work?

rigoletto updated this revision to Diff 52061.Dec 15 2018, 6:36 PM

Revert the port and add upstream patch fxing the build. :-D

Thanks!

Harbormaster completed remote builds in B21592: Diff 52061.Dec 15 2018, 6:36 PM
tcberner added a comment.Dec 15 2018, 6:39 PM

I would simply use the raw content from the commit as patch :)

x11/polybar/Makefile
18 ↗(On Diff #52061)

^ revert

rigoletto updated this revision to Diff 52063.Dec 15 2018, 6:52 PM

Done. Thanks! ^^

Harbormaster completed remote builds in B21594: Diff 52063.Dec 15 2018, 6:52 PM
rigoletto marked an inline comment as done.Dec 15 2018, 6:57 PM
tcberner accepted this revision.Dec 19 2018, 10:03 PM

I would prefer the upstream patch directly :) - but if it does not apply after de-gitifying, go ahead.

This revision is now accepted and ready to land.Dec 19 2018, 10:03 PM
rigoletto updated this revision to Diff 52173.Dec 19 2018, 10:08 PM

Keep the headers in the patch. Thanks!

This revision now requires review to proceed.Dec 19 2018, 10:08 PM
Harbormaster completed remote builds in B21646: Diff 52173.Dec 19 2018, 10:08 PM
This revision was not accepted when it landed; it landed in state Needs Review.Dec 19 2018, 11:23 PM
Closed by commit rP487818: x11/polybar: fix build on 13-CURRENT. (authored by rigoletto). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
x11/
polybar/
files/
23 lines

Diff 52178

View Options

head/x11/polybar/files/patch-git_3b32f58

Loading...