[WIP] Fix NetBSD build #2089
[WIP] Fix NetBSD build #2089
Conversation
github-actions
bot
added
sources
✅ Deploy Preview for conkyweb canceled.
|
|
Please hold off until fix for OpenBSD is merged. It conflicts with these changes and makes some of them unnecessary - e.g. adding -lintl manually (bad practice; already handled by official CMake script included into the other branch) Merging either PR first will require fixing Alternatively, rebase to other branch to continue development. When you chain them like this, when each branch is merged, the next can be rebased to conky/main which will avoid all conflicts and allows you to develop as many future branches in advance as you want. |
|
Sure. I'll do the rebasing, just wanted to save my work and signal that I'm working on it. It is done at the moment, it compiles and runs. It misses a lot of features, but it can be improved later. |
|
And sorry for the inconvinience, but now I have time to work on it. I do not mind rebasing and fixing the conflicts. |
Using NetBSD 10.0. Compiling with: `cmake -DBUILD_IMLIB2=OFF ..`. There are a lot of `TODO`s.
Caellian
force-pushed
the
fix/netbsd10-build
branch
from
b526cea
to
a6ca22c
Compare
Not an inconvenience. I just warned you because I did the same thing in one of my first commits and it ended up being such a mess that I had to abandon the PR and create a new one with no history (just one example). Anyway, merged the other branch and rebased this one (reminder to pull before making the next commit), only a single conflict. |
| @@ -97,6 +97,7 @@ endif(CMAKE_SYSTEM_NAME MATCHES "SunOS") | |||
|
|
|||
| if(CMAKE_SYSTEM_NAME MATCHES "NetBSD") | |||
| set(OS_NETBSD true) | |||
| set(conky_libs ${conky_libs} -lkvm -lintl -lossaudio) | |||
There was a problem hiding this comment.
-lintlnot needed.-lossaudioshould be handled on line 159 in this file presumably by addingOR OS_NETBSDtoelseif(OS_OPENBSD)
| set(conky_includes ${conky_includes} ${CURSES_INCLUDE_DIR}) | ||
| if(OS_NETBSD) | ||
| set(conky_includes ${conky_includes} /usr/pkg/include) | ||
| set(conky_includes ${conky_includes} /usr/pkg/include/ncurses) | ||
| else(OS_NETBSD) | ||
| set(conky_includes ${conky_includes} ${CURSES_INCLUDE_DIR}) | ||
| endif(OS_NETBSD) |
There was a problem hiding this comment.
This whole BUILD_NCURSES block should really do what this patch for weechat on NetBSD does - check for both ncurses and curses.
Waiting for #2080.
Using NetBSD 10.0.
Compiling with:
cmake -DBUILD_IMLIB2=OFF ..There are a lot of
TODOs, but it compiles.