diff options
author | toonn <toonn@toonn.io> | 2023-11-03 16:40:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-03 16:40:28 +0100 |
commit | 81093a6c4a2fa2223ef2fb819a61fa406df4c820 (patch) | |
tree | 52f7ca13b072673fdb60ae5dc1af26cf57ccc007 /pkgs | |
parent | 3de81b07243b53baa6c47c79c8be23f6a12d6e44 (diff) | |
parent | 7b4e8f91da954ab741df634f440f57699bd84a57 (diff) |
Merge pull request #262580 from reckenrode/dante-fix
dante: fix build with clang 16
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/dante/clang-osint-m4.patch | 34 | ||||
-rw-r--r-- | pkgs/servers/dante/default.nix | 9 |
2 files changed, 41 insertions, 2 deletions
diff --git a/pkgs/servers/dante/clang-osint-m4.patch b/pkgs/servers/dante/clang-osint-m4.patch new file mode 100644 index 0000000000000..65281e22ea0e4 --- /dev/null +++ b/pkgs/servers/dante/clang-osint-m4.patch @@ -0,0 +1,34 @@ +diff -ur a/osdep.m4 b/osdep.m4 +--- a/osdep.m4 2017-01-18 09:11:20.000000000 -0500 ++++ b/osdep.m4 2023-10-21 12:43:59.464797030 -0400 +@@ -381,6 +381,7 @@ + unset have_sa_len + AC_MSG_CHECKING([for sa_len in sockaddr]) + AC_TRY_COMPILE([ ++#include <stdint.h> + #include <sys/types.h> + #include <sys/socket.h> + ], [struct sockaddr sa; +@@ -397,12 +398,13 @@ + unset sa_len_type_found + for type in uint8_t "unsigned char"; do + AC_TRY_COMPILE([ ++#include <stdint.h> + #include <sys/types.h> + #include <sys/socket.h>], [ + struct sockaddr sa; + $type *sa_len_ptr; + sa_len_ptr = &sa.sa_len; +-sa_len_ptr++; /* use to avoid warning/error */], ++(*sa_len_ptr)++; /* use to avoid warning/error */], + [AC_DEFINE_UNQUOTED(sa_len_type, [$type], [sa_len type]) + sa_len_type_found=t + break]) +@@ -636,6 +638,7 @@ + in_port_t, in_addr_t], + , , + [ ++#include <stdint.h> + #include <sys/types.h> + #include <netinet/in.h> + ]) diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index 49e6a26f455fa..a5806a20d4113 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -22,12 +22,17 @@ stdenv.mkDerivation rec { dontAddDisableDepTrack = stdenv.isDarwin; - patches = lib.optionals remove_getaddrinfo_checks [ + patches = [ + # Fixes several issues with `osint.m4` that causes incorrect check failures when using newer + # versions of clang: missing `stdint.h` for `uint8_t` and unused `sa_len_ptr`. + ./clang-osint-m4.patch + ] ++ lib.optionals remove_getaddrinfo_checks [ (fetchpatch { name = "0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch"; url = "https://raw.githubusercontent.com/buildroot/buildroot/master/package/dante/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch"; sha256 = "sha256-e+qF8lB5tkiA7RlJ+tX5O6KxQrQp33RSPdP1TxU961Y="; - }) ]; + }) + ]; postPatch = '' substituteInPlace include/redefgen.sh --replace 'PATH=/bin:/usr/bin:/sbin:/usr/sbin' "" |