Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build on FreeBSD. #1539

Merged
merged 1 commit into from May 17, 2023
Merged

Fix build on FreeBSD. #1539

merged 1 commit into from May 17, 2023

Conversation

madpilot78
Copy link
Contributor

The freq_sysctl varaible is being redefined with a different type.

Update the first definition directly.

The error was:

FAILED: src/CMakeFiles/conky.dir/freebsd.cc.o 
/usr/local/libexec/ccache/c++ -D_LARGEFILE64_SOURCE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D__BSD_VISIBLE=1 -I/wrkdirs/usr/ports/sysutils/conky/work/conky-1.19.2/3rdparty/toluapp/include -I/wrkdirs/usr/ports/sysutils/conky/work/.build -I/usr/local/include/freetype2 -I/usr/local/include/libepoll-shim -I/usr/local/include/pango-1.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/harfbuzz -I/usr/local/include/libpng16 -I/usr/local/include/fribidi -I/usr/local/include/cairo -I/usr/local/include/pixman-1 -I/usr/local/include/lua53 -I/usr/local/include/libxml2 -I/wrkdirs/usr/ports/sysutils/conky/work/.build/data -I/wrkdirs/usr/ports/sysutils/conky/work/.build/src -O2 -pipe -DLIBICONV_PLUG -fstack-protector-strong -isystem /usr/local/include -fno-strict-aliasing  -DLIBICONV_PLUG -isystem /usr/local/include -O2 -pipe -DLIBICONV_PLUG -fstack-protector-strong -isystem /usr/local/include -fno-strict-aliasing  -DLIBICONV_PLUG -isystem /usr/local/include  -DNDEBUG -std=c++17 -stdlib=libc++ -MD -MT src/CMakeFiles/conky.dir/freebsd.cc.o -MF src/CMakeFiles/conky.dir/freebsd.cc.o.d -o src/CMakeFiles/conky.dir/freebsd.cc.o -c /wrkdirs/usr/ports/sysutils/conky/work/conky-1.19.2/src/freebsd.cc
/wrkdirs/usr/ports/sysutils/conky/work/conky-1.19.2/src/freebsd.cc:77:16: warning: 'gnu_inline' attribute without 'extern' in C++ treated as externally available, this changed in Clang 10 [-Wgnu-inline-cpp-without-extern]
__attribute__((gnu_inline)) inline void proc_find_top(struct process **cpu,
               ^
/wrkdirs/usr/ports/sysutils/conky/work/conky-1.19.2/src/freebsd.cc:554:8: error: redefinition of 'freq_sysctl' with a different type: 'char[16]' vs 'char *'
  char freq_sysctl[16] = {0};
       ^
/wrkdirs/usr/ports/sysutils/conky/work/conky-1.19.2/src/freebsd.cc:547:9: note: previous definition is here
  char *freq_sysctl;
        ^
1 warning and 1 error generated.

The freq_sysctl varaible is being redefined with a different type.

Update the first definition directly.
@netlify
Copy link

netlify bot commented May 17, 2023

Deploy Preview for conkyweb canceled.

Name Link
🔨 Latest commit 5286e6c
🔍 Latest deploy log https://app.netlify.com/sites/conkyweb/deploys/64653608a0c77800081d0549

@github-actions github-actions bot added the sources PR modifies project sources label May 17, 2023
freebsd-git pushed a commit to freebsd/freebsd-ports that referenced this pull request May 17, 2023
Add patch to fix build.

Patch submitted upstream: brndnmtthws/conky#1539
Copy link
Collaborator

@bi4k8 bi4k8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks for the fix.

@bi4k8 bi4k8 merged commit 796802b into brndnmtthws:main May 17, 2023
52 checks passed
@madpilot78 madpilot78 deleted the FreeBSD_Build_Fix branch May 17, 2023 22:38
@brndnmtthws brndnmtthws added the bug Bug report or bug fix PR label May 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Bug report or bug fix PR sources PR modifies project sources
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants