Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gdbm: avoid a warning on Darwin #44875

Merged
merged 1 commit into from Aug 10, 2018
Merged

Conversation

vcunat
Copy link
Member

@vcunat vcunat commented Aug 10, 2018

This is just to minimize rebuilds. The actual bugfix doesn't seem to
hurry, as the function has been returning void until now, so if the int
returned isn't a meaningful value in some cases, nothing should happen
yet.


No rebuild except on Darwin (where it was failing).

I wasn't sure when this is required on cross-compilation, so the condition might be imprecise.

@vcunat vcunat added the 6.topic: darwin Running or building packages on Darwin label Aug 10, 2018
@vcunat
Copy link
Member Author

vcunat commented Aug 10, 2018

@GrahamcOfBorg build gdbm

@vcunat vcunat mentioned this pull request Aug 10, 2018
9 tasks
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gdbm

Partial log (click to expand)

these paths will be fetched (6.11 MiB download, 24.46 MiB unpacked):
  /nix/store/rvmrk2ziwvz1rawkx4czriq6v8v1m8g4-glibc-2.27
  /nix/store/zd24kjkx4gji3zj543r7fjxisz2ddfq9-gdbm-1.17
copying path '/nix/store/rvmrk2ziwvz1rawkx4czriq6v8v1m8g4-glibc-2.27' from 'https://cache.nixos.org'...
copying path '/nix/store/zd24kjkx4gji3zj543r7fjxisz2ddfq9-gdbm-1.17' from 'https://cache.nixos.org'...
/nix/store/zd24kjkx4gji3zj543r7fjxisz2ddfq9-gdbm-1.17

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: gdbm

Partial log (click to expand)

make[2]: Nothing to be done for 'install-exec-am'.
make[2]: Nothing to be done for 'install-data-am'.
make[2]: Leaving directory '/private/tmp/nix-build-gdbm-1.17.drv-0/gdbm-1.17'
make[1]: Leaving directory '/private/tmp/nix-build-gdbm-1.17.drv-0/gdbm-1.17'
post-installation fixup
gzipping man pages under /nix/store/a3d984scqiwpcjccjbxnvzs3jhmx7vfm-gdbm-1.17/share/man/
strip is /nix/store/bg39mxc401qqxgjasxfgardi6xl2ikmc-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/a3d984scqiwpcjccjbxnvzs3jhmx7vfm-gdbm-1.17/lib  /nix/store/a3d984scqiwpcjccjbxnvzs3jhmx7vfm-gdbm-1.17/bin
patching script interpreter paths in /nix/store/a3d984scqiwpcjccjbxnvzs3jhmx7vfm-gdbm-1.17
/nix/store/a3d984scqiwpcjccjbxnvzs3jhmx7vfm-gdbm-1.17

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gdbm

Partial log (click to expand)

these paths will be fetched (0.15 MiB download, 0.60 MiB unpacked):
  /nix/store/zd24kjkx4gji3zj543r7fjxisz2ddfq9-gdbm-1.17
fetching path ‘/nix/store/zd24kjkx4gji3zj543r7fjxisz2ddfq9-gdbm-1.17’...

*** Downloading ‘https://nix-cache.s3.amazonaws.com/nar/0q55l1q04hhjzwaxm87x674ip28qsiy4b47r4l7pv7mmbahkbf3m.nar.xz’ (signed by ‘cache.nixos.org-1’) to ‘/nix/store/zd24kjkx4gji3zj543r7fjxisz2ddfq9-gdbm-1.17’...
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
 88  156k   88  138k    0     0   138k      0  0:00:01 --:--:--  0:00:01  531k
100  156k  100  156k    0     0   156k      0  0:00:01 --:--:--  0:00:01  597k

/nix/store/zd24kjkx4gji3zj543r7fjxisz2ddfq9-gdbm-1.17

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: gdbm

Partial log (click to expand)

make[2]: Nothing to be done for 'install-exec-am'.
make[2]: Nothing to be done for 'install-data-am'.
make[2]: Leaving directory '/private/tmp/nix-build-gdbm-1.17.drv-0/gdbm-1.17'
make[1]: Leaving directory '/private/tmp/nix-build-gdbm-1.17.drv-0/gdbm-1.17'
post-installation fixup
gzipping man pages under /nix/store/a3d984scqiwpcjccjbxnvzs3jhmx7vfm-gdbm-1.17/share/man/
strip is /nix/store/bg39mxc401qqxgjasxfgardi6xl2ikmc-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/a3d984scqiwpcjccjbxnvzs3jhmx7vfm-gdbm-1.17/lib  /nix/store/a3d984scqiwpcjccjbxnvzs3jhmx7vfm-gdbm-1.17/bin
patching script interpreter paths in /nix/store/a3d984scqiwpcjccjbxnvzs3jhmx7vfm-gdbm-1.17
/nix/store/a3d984scqiwpcjccjbxnvzs3jhmx7vfm-gdbm-1.17

@@ -2,6 +2,8 @@

stdenv.mkDerivation rec {
name = "gdbm-1.17";
# FIXME: remove on update to > 1.17
NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-Wno-error=return-type" else null;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is nitpicking but technically this should be stdenv.cc.isClang. This works too but just because no one else is using clang.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, right, I was thinking of build vs. host and didn't realize that the compiler vendor is more likely to be the significant difference.

This is just to minimize rebuilds.  The actual bugfix doesn't seem to
hurry, as the function has been returning void until now, so if the int
returned isn't a meaningful value in some cases, nothing should happen
yet.
@vcunat vcunat merged commit 7b3036a into NixOS:staging-next Aug 10, 2018
@vcunat vcunat deleted the p/gdbm-darwin branch August 10, 2018 16:42
@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: gdbm

Partial log (click to expand)

/nix/store/a3d984scqiwpcjccjbxnvzs3jhmx7vfm-gdbm-1.17

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gdbm

Partial log (click to expand)

/nix/store/zd24kjkx4gji3zj543r7fjxisz2ddfq9-gdbm-1.17

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: gdbm

Partial log (click to expand)

shrinking /nix/store/hmh2p1f7ryx3fjjc7i6281mjpm87q0fm-gdbm-1.17/bin/gdbm_load
shrinking /nix/store/hmh2p1f7ryx3fjjc7i6281mjpm87q0fm-gdbm-1.17/bin/gdbmtool
shrinking /nix/store/hmh2p1f7ryx3fjjc7i6281mjpm87q0fm-gdbm-1.17/lib/libgdbm_compat.so.4.0.0
shrinking /nix/store/hmh2p1f7ryx3fjjc7i6281mjpm87q0fm-gdbm-1.17/lib/libgdbm.so.6.0.0
gzipping man pages under /nix/store/hmh2p1f7ryx3fjjc7i6281mjpm87q0fm-gdbm-1.17/share/man/
strip is /nix/store/4md2i310zklkkl5j41yw70gcwgn4kav5-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/hmh2p1f7ryx3fjjc7i6281mjpm87q0fm-gdbm-1.17/lib  /nix/store/hmh2p1f7ryx3fjjc7i6281mjpm87q0fm-gdbm-1.17/bin
patching script interpreter paths in /nix/store/hmh2p1f7ryx3fjjc7i6281mjpm87q0fm-gdbm-1.17
checking for references to /build in /nix/store/hmh2p1f7ryx3fjjc7i6281mjpm87q0fm-gdbm-1.17...
/nix/store/hmh2p1f7ryx3fjjc7i6281mjpm87q0fm-gdbm-1.17

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: gdbm

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/d482h34a2w2adnv8a3wq70xpd26qcq6v-gnugrep-3.1
shrinking /nix/store/d482h34a2w2adnv8a3wq70xpd26qcq6v-gnugrep-3.1/bin/grep
gzipping man pages under /nix/store/d482h34a2w2adnv8a3wq70xpd26qcq6v-gnugrep-3.1/share/man/
strip is /nix/store/gfgczbs0cy0blibb0acv39cayq7qbplg-bootstrap-tools/bin/strip
stripping (with command strip and flags -S) in /nix/store/d482h34a2w2adnv8a3wq70xpd26qcq6v-gnugrep-3.1/bin
checking for references to /build in /nix/store/d482h34a2w2adnv8a3wq70xpd26qcq6v-gnugrep-3.1...
shrinking RPATHs of ELF executables and libraries in /nix/store/8wsnm421kqc07yhmzh9hq9s52r3405zi-gnugrep-3.1-info
strip is /nix/store/gfgczbs0cy0blibb0acv39cayq7qbplg-bootstrap-tools/bin/strip
checking for references to /build in /nix/store/8wsnm421kqc07yhmzh9hq9s52r3405zi-gnugrep-3.1-info...
/nix/store/hmh2p1f7ryx3fjjc7i6281mjpm87q0fm-gdbm-1.17

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: gdbm

Partial log (click to expand)

  /nix/store/cg5r2hamxlm0ih6sqhi5il09m29cag8v-lzip-1.20.drv
  /nix/store/szm1gb2rws64f7l5ygdmicdj3n8xqbsw-ed-1.14.2.drv
  /nix/store/r39cd13msi8cfbs67rgkzp7qqx6w9zp8-patch-2.7.6.drv
  /nix/store/ympq4d3qh2qxxd4cjqv1p3fgqh85m277-bzip2-1.0.6.0.1.drv
  /nix/store/yw7hq6snqbvd8qjsl2cpx1fw6zkckisy-findutils-4.6.0.drv
  /nix/store/zflrs3dxnmbz8fmdrph0lriadjyj71jy-paxctl-0.9.drv
  /nix/store/98dn9azrdggh9i1c5g8qxjaj96cznma2-stdenv-linux.drv
  /nix/store/9bavj1rxl0gbj4dyzka3yl3671wk1r1y-gdbm-1.17.drv
waiting for locks or build slots...
/nix/store/hmh2p1f7ryx3fjjc7i6281mjpm87q0fm-gdbm-1.17

@vcunat vcunat mentioned this pull request Aug 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants