Skip to content

Comments

bluez: add musl patches#141973

Closed
yu-re-ka wants to merge 1 commit intoNixOS:stagingfrom
yu-re-ka:feature-bluez-musl
Closed

bluez: add musl patches#141973
yu-re-ka wants to merge 1 commit intoNixOS:stagingfrom
yu-re-ka:feature-bluez-musl

Conversation

@yu-re-ka
Copy link
Contributor

Motivation for this change
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Oct 17, 2021
@yu-re-ka
Copy link
Contributor Author

@ofborg build pkgsMusl.bluez

@r-burns
Copy link
Contributor

r-burns commented Oct 17, 2021

I can't test because of the systemd dependency. Were you going to add a --disable-systemd flag for musl?

@yu-re-ka
Copy link
Contributor Author

yu-re-ka commented Oct 18, 2021

I can't test because of the systemd dependency. Were you going to add a --disable-systemd flag for musl?

You can rebase on #141980. We can also wait until it gets merged (or closed) before proceeding here.

@r-burns
Copy link
Contributor

r-burns commented Oct 18, 2021

Oh, cool! I thought systemd on musl was a no-go, but cheers to OpenEmbedded. I will definitely take a look at that PR.

No need to hold this up, since the fixes here are independently correct. I just wasn't sure how to test :)

@yu-re-ka yu-re-ka requested review from Lassulus and alyssais October 20, 2021 11:29
@Lassulus
Copy link
Member

hmm how to test this? pkgsMusl.bluez failed while building systemd-minimal for me with:

FAILED: systemd-update-utmp.p/src_update-utmp_update-utmp.c.o
gcc -Isystemd-update-utmp.p -I. -I.. -Isrc/basic -I../src/basic -Isrc/fundamental -I../src/fundamental -Isrc/systemd -I../src/systemd -I../src/libsystemd/sd-bus -I../src/libsystemd/sd-device -I../src/libsystemd/sd-event -I../src/libsystemd/sd-hwdb -I../src/libsystemd/sd-id128 -I../src/libsystemd/sd-journal -I../src/libsystemd/sd-netlink -I../src/libsystemd/sd-network -I../src/libsystemd/sd-resolve -Isrc/shared -I../src/shared -I/nix/store/6xyn8q9l49zazcnckb5ln6j26j87fxwg-audit-2.8.5-dev/include -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu99 -Wno-format-signedness -Wno-missing-field-initializers -Wno-unused-parameter -Wno-unused-result -Wdate-time -Wendif-labels -Werror=format=2 -Werror=implicit-function-declaration -Werror=incompatible-pointer-types -Werror=overflow -Werror=return-type -Werror=shift-count-overflow -Werror=shift-overflow=2 -Werror=undef -Wfloat-equal -Wimplicit-fallthrough=5 -Winit-self -Wlogical-op -Wmissing-include-dirs -Wmissing-noreturn -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-aliasing=2 -Wstrict-prototypes -Wsuggest-attribute=noreturn -Wwrite-strings -Werror=missing-declarations -Werror=missing-prototypes -fdiagnostics-show-option -ffast-math -fno-common -fno-strict-aliasing -fstack-protector -fstack-protector-strong -fvisibility=hidden --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -Werror=shadow -include config.h -fPIE -MD -MQ systemd-update-utmp.p/src_update-utmp_update-utmp.c.o -MF systemd-update-utmp.p/src_update-utmp_update-utmp.c.o.d -o systemd-update-utmp.p/src_update-utmp_update-utmp.c.o -c ../src/update-utmp/update-utmp.c
In file included from ../src/update-utmp/update-utmp.c:23:
../src/basic/stdio-util.h:4:10: fatal error: printf.h: No such file or directory
    4 | #include <printf.h>
      |          ^~~~~~~~~~
compilation terminated.
ninja: build stopped: subcommand failed.
builder for '/nix/store/qa9zx1hv1crzbfyn2q7p4bjmmmigl3jn-systemd-minimal-249.4.drv' failed with exit code 1
cannot build derivation '/nix/store/50k50aizx1045ngy3wrba463vxq7g7d4-libfido2-1.8.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/nlcdbs5cffdxz7lr1wdi0ngc1mjwzqw0-lvm2-2.03.12.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/d1zfyrk5jaryhn1x8bq2inlckaxhclm6-systemd-249.4.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/wlz2zl9racccspixw0pzc0pwa1yd60bf-bluez-5.61.drv': 1 dependencies couldn't be built
error: build of '/nix/store/wlz2zl9racccspixw0pzc0pwa1yd60bf-bluez-5.61.drv' failed

@yu-re-ka
Copy link
Contributor Author

yu-re-ka commented Oct 26, 2021

@Lassulus I rebased, now systemd will build. You also need to disable tests of libical:

diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index 909ee73e69a..4eb8670664b 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
 
   # Using install check so we do not have to manually set
   # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables
-  doInstallCheck = true;
+  doInstallCheck = false;
   enableParallelChecking = false;
   preInstallCheck = if stdenv.isDarwin then ''
     for testexe in $(find ./src/test -maxdepth 1 -type f -executable); do

Then you should be able to build pkgsMusl.bluez.

@SuperSandro2000 if you look closely, the portion you commented on is not edited by this PR.

@yu-re-ka
Copy link
Contributor Author

yu-re-ka commented Nov 8, 2021

Whatever

@yu-re-ka yu-re-ka closed this Nov 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants