Skip to content

multipath-tools: Fix build with multiple-output lvm2#93949

Merged
Mic92 merged 1 commit intoNixOS:masterfrom
andersk:multipath-tools
Jul 27, 2020
Merged

multipath-tools: Fix build with multiple-output lvm2#93949
Mic92 merged 1 commit intoNixOS:masterfrom
andersk:multipath-tools

Conversation

@andersk
Copy link
Copy Markdown
Contributor

@andersk andersk commented Jul 27, 2020

Motivation for this change

It was broken by commit d3a991d (#93024).

gcc -O2 -g -pipe -Wall -Wextra -Wformat=2 -Werror=implicit-int -Werror=implicit-function-declaration -Werror=format-security -Wno-sign-compare -Wno-unused-parameter -Wno-clobbered -Werror=cast-qual -Werror=discarded-qualifiers -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong --param=ssp-buffer-size=4 -DBIN_DIR=\"/nix/store/k6c2lqi2rm1ara0sa7zm4j1kadmyzn3d-multipath-tools-0.8.3/sbin\" -DLIB_STRING=\"lib\" -DRUN_DIR=\"run\" -MMD -MP  -fPIC -I../libmpathcmd -I../libmpathpersist -I../libmultipath/nvme -DUSE_SYSTEMD=245 -c -o devmapper.o devmapper.c
devmapper.c:47:19: error: conflicting types for 'dm_task_set_cookie'
   47 | static inline int dm_task_set_cookie(struct dm_task *dmt, uint32_t *c, int a)
      |                   ^~~~~~~~~~~~~~~~~~
In file included from devmapper.c:11:
/nix/store/my4c6x9r0ghgq0cd3y0yss5xz81d9m2l-lvm2-2.03.09-dev/include/libdevmapper.h:225:5: note: previous declaration of 'dm_task_set_cookie' was here
  225 | int dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags);
      |     ^~~~~~~~~~~~~~~~~~
devmapper.c:52:6: error: conflicting types for 'dm_udev_wait'
   52 | void dm_udev_wait(unsigned int c)
      |      ^~~~~~~~~~~~
In file included from devmapper.c:11:
/nix/store/my4c6x9r0ghgq0cd3y0yss5xz81d9m2l-lvm2-2.03.09-dev/include/libdevmapper.h:3744:5: note: previous declaration of 'dm_udev_wait' was here
 3744 | int dm_udev_wait(uint32_t cookie);
      |     ^~~~~~~~~~~~
make[1]: *** [../Makefile.inc:137: devmapper.o] Error 1
make[1]: Leaving directory '/build/multipath-tools-0.8.3/libmultipath'
make: *** [Makefile:25: recurse] Error 2
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

It was broken by commit d3a991d
(NixOS#93024).

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
@andersk andersk mentioned this pull request Jul 27, 2020
10 tasks
@andersk andersk requested a review from flokli July 27, 2020 05:59
@andersk andersk added 0.kind: bug Something is broken 0.kind: regression Something that worked before working no longer labels Jul 27, 2020
@Mic92 Mic92 merged commit 7bf0f73 into NixOS:master Jul 27, 2020
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jul 27, 2020
@andersk andersk deleted the multipath-tools branch December 26, 2022 21:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0.kind: bug Something is broken 0.kind: regression Something that worked before working no longer 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants