Fix OpenBSD build #2080

g0mb4 · 2024-11-15T16:13:59Z

Using OpenBSD 7.6.

Try to close #2073, unfortunately #2075 is not enough.

netlify · 2024-11-15T16:14:14Z

✅ Deploy Preview for conkyweb canceled.

Name	Link
🔨 Latest commit	`fc7dead`
🔍 Latest deploy log	https://app.netlify.com/sites/conkyweb/deploys/674113562ec2b40008de05eb

Work in progress.

Signed-off-by: Tin Švagelj <[email protected]>

Caellian · 2024-11-15T21:39:48Z

Referencing #2052 as cause of issues.

g0mb4 · 2024-11-15T21:43:30Z

I'm just running make and fixing the warnings/errors :)

I want it to compile first, then fix the issues with the other platforms.

Signed-off-by: Tin Švagelj <[email protected]>

g0mb4 · 2024-11-15T21:57:24Z

And yes, void f(void) is done by my autopiloted brain.

Signed-off-by: Tin Švagelj <[email protected]>

- Fix `~` substitution. - Add more tests for to_real_path. Signed-off-by: Tin Švagelj <[email protected]>

Signed-off-by: Tin Švagelj <[email protected]>

This reverts commit b8c7012. None of the workers work "out of the box". Better to put this into a separate PR to avoid blocking the more important one.

Signed-off-by: Tin Švagelj <[email protected]>

Per documentation: <XXX>_LIBRARIES - only the libraries (without the '-l') <XXX>_LINK_LIBRARIES - the libraries and their absolute paths Using _LIBRARIES assumes that appropriate default -L arguments will be provided by the environment/system. CMake discourages directly adding paths with -L or link_directiories because it polutes the environment and can cause issues. So the only way to ensure correct build on some platforms is to use absolute paths provided by _LINK_LIBRARIES. Signed-off-by: Tin Švagelj <[email protected]>

It's default so it only causes compile warnings Signed-off-by: Tin Švagelj <[email protected]>

Caellian · 2024-11-16T13:14:41Z

I believe that pretty much covers my intent behind #2075. I'm building this from a minimal VM environment and would appreciate if you could test it @g0mb4. Feel free to implement any of the added stubs before requesting review.

For future reference (CI?), package names:

Minimal package dependencies:

git (to clone)
cmake
gperf
lua-5.3
X11 (comes preinstalled)
- imlib2

Optional pkg deps:

cairo (if BUILD_LUA_CAIRO, BUILD_LUA_CAIRO_XLIB)
imlib2 (if BUILD_LUA_IMLIB2)
librsvg (if BUILD_LUA_RSVG)

g0mb4 · 2024-11-16T13:26:53Z

Wow! Thank you for the help! I'll test is as soon as possible.

A cross-platform solution is already implemented in brndnmtthws#2080. This PR will be rebased *after* the OpenBSD fix was merged.

_LINK_LIBRARIES is used so there will be no more -lX11 args. Signed-off-by: Tin Švagelj <[email protected]>

g0mb4 · 2024-11-18T08:24:33Z

It works on my setup.

g0mb4 · 2024-11-18T08:29:00Z

I think adding more features really should be part of a new PR.

Caellian · 2024-11-19T00:09:24Z

Alright, then it's done.

I didn't test all possible features because built time was atrocious, but I think they're likely to work. Core, X11 stuff and LUA stuff is confirmed to build on different architectures.

Following BUILD_* features might warrant additional attention in separate PRs, but in general they should work if appropriate dependencies are installed:

`BUILD_*`	Works	Port (/dependency)
`AUDACIOUS`	should	`audacious`
`CURL`	should	`curl` (in default install)
`HTTP`	should	`libmicrohttpd`
`ICAL`	should	`libical`
`INTEL_BACKLIGHT`	unknown	`/sys/class/backlight/intel_backlight`
`IRC`	should	`libircclient`
`JOURNAL`	unlikely	`systemd`
`MYSQL`	should	`mysql.h` provider (mariadb?)
`NVIDIA`	nvidia support flaky	`NVCtrl` header provider
`PULSEAUDIO`	should	`pulseaudio`
`RSS`	should	`curl` (default), `libxml-2.13`
`WLAN`	not used; always enabled - packagers should enable it by default to avoid breakage	ioctl and native headers
`XMMS2`	should	`xmms2`

Adding CI would be nice even if OpenBSD isn't a primary support target because it would improve code quality by failing on non standard language/stdlib use.

src/common.cc

This avoids feature regression but still works better for OpenBSD than always returning an empty string when to_real_path is called. Signed-off-by: Tin Švagelj <[email protected]>

Caellian

From perspective of already supported platforms these are minor consistency tweaks.

From perspective of OpenBSD, it allows conky to at least build which is most important because official OpenBSD port is stuck on a very old version due to build issues.

I'm merging this so @g0mb4 can continue working on NetBSD support in #2089 without having to deal with rebasing.

@brndnmtthws feel free to revert this PR if you don't like something about this, but I'll merge it for now given that CI passes (builds) so none of the already supported platforms should be affected. See the commit message for an exhaustive summary.

@g0mb4 don't delete the branch in case @brndnmtthws rolls it back and requests edits.

* Implement `-U` for Haiku. This patch also fixes a compilation error on Haiku. Compiled with `cmake -DBUILD_X11=FALSE ..` Tested on Haiku-r1beta5. Takes part of #2072. * Revert `common.cc`. A cross-platform solution is already implemented in #2080. This PR will be rebased *after* the OpenBSD fix was merged. * Haiku: Remove `wordexp.h`. Use the `to_real_path()` used for OpenBSD. * Haiku: Remove `HAIKU_HOME_DIR`. It was not used.

github-actions bot added sources PR modifies project sources 3rdparty suggests changes to 3rd party dependencies power related to battery and power management code labels Nov 15, 2024

g0mb4 changed the title ~~[WIP] Fixing OpenBSD build.~~ [WIP] Fix OpenBSD build. Nov 15, 2024

Fixing OpenBSD build.

b96c5e2

Work in progress.

Caellian added bug related to incorrect existing implementation of some functionality os: openbsd related to OpenBSD labels Nov 15, 2024

Caellian mentioned this pull request Nov 15, 2024

Add math.h include to Vc/scalar/math.h #2075

Closed

This comment was marked as outdated.

Sign in to view

Fix unclosed OBJ in core.cc

f948060

Signed-off-by: Tin Švagelj <[email protected]>

Revert explicit void argument changes

142ddd3

Signed-off-by: Tin Švagelj <[email protected]>

Implement to_real_path in a cross-platform way

150c5dd

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the fix/openbsd76-build branch from 13e3858 to 150c5dd Compare November 15, 2024 22:09

Use weakly_canonical to handle non-existant paths

a64f0af

- Fix `~` substitution. - Add more tests for to_real_path. Signed-off-by: Tin Švagelj <[email protected]>

github-actions bot added the tests related to project tests label Nov 15, 2024

Caellian force-pushed the fix/openbsd76-build branch from 3915c89 to a64f0af Compare November 15, 2024 22:28

Simplify to_real_path

ec199aa

Signed-off-by: Tin Švagelj <[email protected]>

github-actions bot added the gh-actions suggest changing GitHub actions label Nov 15, 2024

Caellian force-pushed the fix/openbsd76-build branch from f1aad1b to 2255929 Compare November 15, 2024 23:05

Add OpenBSD CI

b8c7012

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the fix/openbsd76-build branch from 2255929 to b8c7012 Compare November 15, 2024 23:08

Caellian mentioned this pull request Nov 15, 2024

Implement -U for Haiku. #2079

Merged

Revert "Add OpenBSD CI"

005de6f

This reverts commit b8c7012. None of the workers work "out of the box". Better to put this into a separate PR to avoid blocking the more important one.

github-actions bot removed the gh-actions suggest changing GitHub actions label Nov 15, 2024

Fix architecture specific include

0eb1e3b

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the fix/openbsd76-build branch from fefa25a to 7fc6c69 Compare November 16, 2024 03:32

Stub get_battery_short_status

0704c71

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the fix/openbsd76-build branch 3 times, most recently from 8b795e0 to 905aa15 Compare November 16, 2024 08:21

Caellian added 3 commits November 16, 2024 12:36

Cleanup and reduce diff

fd05a12

Signed-off-by: Tin Švagelj <[email protected]>

Fix X11 library references for lua modules

156c9d7

Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the fix/openbsd76-build branch from a0a17fb to 96e84fa Compare November 16, 2024 11:37

Remove -stdlib=libc++ on OpenBSD

46ca24e

It's default so it only causes compile warnings Signed-off-by: Tin Švagelj <[email protected]>

g0mb4 added a commit to g0mb4/conky that referenced this pull request Nov 16, 2024

Revert common.cc.

637ad69

A cross-platform solution is already implemented in brndnmtthws#2080. This PR will be rebased *after* the OpenBSD fix was merged.

Remove -lX11 patch

3ad7175

_LINK_LIBRARIES is used so there will be no more -lX11 args. Signed-off-by: Tin Švagelj <[email protected]>

g0mb4 marked this pull request as ready for review November 18, 2024 08:24

g0mb4 changed the title ~~[WIP] Fix OpenBSD build.~~ Fix OpenBSD build. Nov 18, 2024

Caellian changed the title ~~Fix OpenBSD build.~~ Fix OpenBSD build Nov 18, 2024

Caellian requested a review from brndnmtthws November 19, 2024 00:10

Caellian reviewed Nov 21, 2024

View reviewed changes

src/common.cc Outdated Show resolved Hide resolved

Caellian mentioned this pull request Nov 21, 2024

[Bug]: unable to build due to Vc on OpenBSD 7.6 #2073

Closed

g0mb4 mentioned this pull request Nov 22, 2024

Fix NetBSD build #2089

Merged

Caellian force-pushed the fix/openbsd76-build branch 2 times, most recently from 0fab7f4 to c0f6a3c Compare November 22, 2024 23:22

Revert wordexp code and use previous code for OpenBSD only

fc7dead

This avoids feature regression but still works better for OpenBSD than always returning an empty string when to_real_path is called. Signed-off-by: Tin Švagelj <[email protected]>

Caellian force-pushed the fix/openbsd76-build branch from c0f6a3c to fc7dead Compare November 22, 2024 23:27

Caellian approved these changes Nov 22, 2024

View reviewed changes

Caellian merged commit 47ec9f9 into brndnmtthws:main Nov 22, 2024
39 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix OpenBSD build #2080

Fix OpenBSD build #2080

g0mb4 commented Nov 15, 2024 •

edited

Loading

netlify bot commented Nov 15, 2024 •

edited

Loading

This comment was marked as outdated.

Caellian commented Nov 15, 2024

g0mb4 commented Nov 15, 2024 •

edited

Loading

g0mb4 commented Nov 15, 2024

Caellian commented Nov 16, 2024

g0mb4 commented Nov 16, 2024

g0mb4 commented Nov 18, 2024

g0mb4 commented Nov 18, 2024

Caellian commented Nov 19, 2024 •

edited

Loading

Caellian left a comment •

edited

Loading

Fix OpenBSD build #2080

Fix OpenBSD build #2080

Conversation

g0mb4 commented Nov 15, 2024 • edited Loading

netlify bot commented Nov 15, 2024 • edited Loading

✅ Deploy Preview for conkyweb canceled.

This comment was marked as outdated.

Caellian commented Nov 15, 2024

g0mb4 commented Nov 15, 2024 • edited Loading

g0mb4 commented Nov 15, 2024

Caellian commented Nov 16, 2024

g0mb4 commented Nov 16, 2024

g0mb4 commented Nov 18, 2024

g0mb4 commented Nov 18, 2024

Caellian commented Nov 19, 2024 • edited Loading

Caellian left a comment • edited Loading

Choose a reason for hiding this comment

g0mb4 commented Nov 15, 2024 •

edited

Loading

netlify bot commented Nov 15, 2024 •

edited

Loading

g0mb4 commented Nov 15, 2024 •

edited

Loading

Caellian commented Nov 19, 2024 •

edited

Loading

Caellian left a comment •

edited

Loading