ldmud: various build fixes #360262
Merged
ldmud: various build fixes #360262
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ofborg
bot
added
the
11.by: package-maintainer
|
Oops. At this point, the package won't build even with this PR. Probably some change in libxml2 triggered that. |
|
I'll take a look |
The LDMud game driver defaults to using a legacy DES hash that is (sensibly) only enabled in the libxcrypt-legacy derivation, not libxcrypt. This commit switches LDMud to that build input instead of libxcrypt. This fixes a runtime error when calling `efun::crypt()` from LPC that would print a confusing error message like "crypt() is not available.".
A fix is underway upstream, but the release cadence is such that we should expect to fix this locally for some time.
The upstream `configure.ac`'s `AC_LANG_PROGRAM` for mysql feature
detection seems to be incompatible with the `mariadb-connector-c`
package, resulting in support not being detected.
Digging in to the `config.log` we can see it's a type mismatch error
from the test program `.c`:
```
configure:11661: checking for mySQL
configure:11694: gcc -c -g -O2 -fwrapv -I/usr/inet6/include -I/nix/store/ya8wpj6dqz39024v6xrv504i9kyidpil-mariadb-connector-c-3.1.21-dev/include/mysql conftest.c >&5
conftest.c: In function 'foo':
conftest.c:90:12: error: returning 'MYSQL *' {aka 'struct st_mysql *'} from a function with incompatible return type 'struct MYSQL *' [-Wincompatible-pointer-types]
90 | return &var;
| ^~~~
```
This commit resolves the issue locally by applying a small patch.
cpu
force-pushed
the
cpu-ldmud-libxcrypt
branch
from
262805e to
04704ad
Compare
@vcunat Indeed you are correct. Thanks for flagging. I pushed two commits (one fixing the |
|
Fixes the build and looks OK at a glance, so why not. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
libxcrypt-legacy
The LDMud game engine defaults to using a legacy DES hash that is (sensibly) only enabled in the
libxcrypt-legacyderivation, notlibxcrypt.This commit switches LDMud to that build input instead of
libxcrypt. This fixes a runtime error when callingefun::crypt()from LPC that would print a confusing error message like "crypt() is not available.".See also #223034
libxml2 2.12+ compat
The v2.12.0 release of
libxml2changed the definition of the callback used withxmlSetStructuredErrorFunc()(reflibxml2NEWS).A fix is underway upstream (ldmud/ldmud#95), but the release cadence is such that we should expect to fix this locally for some time, so a local patch with a fix is applied.
mariadb-connector-c compat
The upstream
configure.ac'sAC_LANG_PROGRAMfor mysql feature detection seems to be incompatible with themariadb-connector-cpackage, resulting in support not being detected.Digging in to the
config.logwe can see it's a type mismatch error from the test program.c:We resolves the issue locally by applying a small patch.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.