Merge pull request #209256 from KAction/patch/v1/pkgsStatic.gsasl

pkgsStatic.gsasl: fix build
This commit is contained in:
Ryan Burns 2023-01-07 11:58:27 -08:00 committed by GitHub
commit 1669256c64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 0 deletions

View File

@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256-ebho47mXbcSE1ZspygroiXvpbOTTbTKu1dk1p6Mwd1k=";
};
# This is actually bug in musl. It is already fixed in trunc and
# this patch won't be necessary with musl > 1.2.3.
#
# https://git.musl-libc.org/cgit/musl/commit/?id=b50eb8c36c20f967bd0ed70c0b0db38a450886ba
patches = lib.optional stdenv.hostPlatform.isMusl ./gsasl.patch;
buildInputs = [ libidn libkrb5 ];
configureFlags = [ "--with-gssapi-impl=mit" ];

View File

@ -0,0 +1,21 @@
GNU libc and Musl libc have different ideas what
strverscmp("UNKNOWN", "2.2.0")
should return. Hopefully nobody depend on this particular behaviour in
practice.
--- a/tests/version.c 1970-01-01 00:00:00.000000000 -0000
+++ b/tests/version.c 1970-01-01 00:00:00.000000000 -0000
@@ -111,11 +111,5 @@
exit_code = EXIT_FAILURE;
}
- if (gsasl_check_version ("UNKNOWN"))
- {
- printf ("FAIL: gsasl_check_version (UNKNOWN)\n");
- exit_code = EXIT_FAILURE;
- }
-
return exit_code;
}