Summary: | sys-apps/tcp-wrappers-7.6.22-r1: can't compile on musl | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Sergey 'L29Ah' Alirzaev <zl29ah> |
Component: | Current packages | Assignee: | Gentoo musl team <musl> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | base-system, grobian |
Priority: | Normal | ||
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Attachments: |
emerge --info
build log Patch against tcp-wrappers-7.6.22 |
Description
Sergey 'L29Ah' Alirzaev
2016-06-29 09:54:48 UTC
Please attach the complete build.log and the output of the "emerge --info" command. Created attachment 439250 [details]
emerge --info
Created attachment 439252 [details]
build log
most likely some incompatibility with musl specifically When using a musl stage the musl overlay should also be used. Many other packages will fail to compile without it. It adds a patch tcp-wrappers-7.6.22-remove-DECLS.patch which should not break anything else (and fix this bug). Maybe it can be included in the main tree. Here it is: diff -Naur tcp_wrappers_7.6.orig/tcpd.h tcp_wrappers_7.6/tcpd.h --- tcp_wrappers_7.6.orig/tcpd.h 2014-03-24 18:39:52.000000000 +0000 +++ tcp_wrappers_7.6/tcpd.h 2014-03-24 18:48:21.000000000 +0000 @@ -11,7 +11,9 @@ #include <netinet/in.h> #include <stdio.h> +#ifdef __cplusplus __BEGIN_DECLS +#endif /* Structure to describe one communications endpoint. */ @@ -252,6 +254,8 @@ extern char *my_strtok(); #endif +#ifdef __cplusplus __END_DECLS +#endif #endif Created attachment 439666 [details, diff]
Patch against tcp-wrappers-7.6.22
Actually, the patch from the musl overlay is not completely correct
(does not work with C++ programs using tcpd.h). See the attached
corrected patch.
It works if installed from the overlay, thank you. I agree Felix' patch (comment #6) looks better and can confirm it fixes the build with musl. Ok to commit that patch to -r2? The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3f24e117981dfca2b86c97525b8c82566bcc022 commit d3f24e117981dfca2b86c97525b8c82566bcc022 Author: John Helmert III <ajak@gentoo.org> AuthorDate: 2021-07-12 02:45:15 +0000 Commit: John Helmert III <ajak@gentoo.org> CommitDate: 2021-07-12 02:48:19 +0000 sys-apps/tcp-wrappers: add 7.6.31 Bumps to Debian patchset 31, fixes musl compilation. Closes: https://bugs.gentoo.org/587498 Acked-by: Sam James <sam@gentoo.org> Signed-off-by: John Helmert III <ajak@gentoo.org> sys-apps/tcp-wrappers/Manifest | 1 + sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild | 108 +++++++++++++++++++++++ 2 files changed, 109 insertions(+) |