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.

Sign up for GitHub

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

Jump to bottom

oath-toolkit: Switch over to git branch (GCC7 fix) #35389

Merged
merged 1 commit into from Feb 23, 2018
Merged

oath-toolkit: Switch over to git branch (GCC7 fix) #35389

merged 1 commit into from Feb 23, 2018

Conversation

clefru
Copy link
Contributor

@clefru clefru commented Feb 23, 2018 •
edited

The git repo doesn't contain a configure script which adds a lot of
build dependencies.

Motivation for this change

#35326

Approaches rejected:

  • Rejected pulling just the GL fix patch from upstream (https://gitlab.com/oath-toolkit/oath-toolkit/commit/a7a989a9e33474aca941fe037259b0289177748e) because this triggers an autoconf rerun, which requires aclocal-1.14, and we don't have automake-1.14 packaged to support this.
  • Rejected rerunning autoconf/autoreconf/automake for the above. That would fail on GL_INIT m4 macros not being there.
  • Rejected not pulling any patches but running "make -f cfg.mk glimport", which runs gnulib-tool import, which presumably updates gnulib's source. This fails with "/nix/store/[..]-gnulib-0.1-357-gffe6467/gnulib-tool: line 4718: ./build-aux/git-version-gen.tmp: Permission denied"

As much as I dislike pulling this from a git repo directly, I haven't found any other way to fix this reasonably easy.

Things done

Test my local TOTP logins. They work as expected.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@clefru
oath-toolkit: Switch over to git branch (GCC7 fix)
4832006 
The git repo doesn't contain a configure script which adds a lot of
build dependencies.
@Mic92
Copy link
Member

Mic92 commented Feb 23, 2018

@GrahamcOfBorg build oath-toolkit

@Mic92
Copy link
Member

Mic92 commented Feb 23, 2018

@GrahamcOfBorg build oathToolkit

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

�[31;1merror:�[0m attribute 'oath-toolkit' in selection path 'oath-toolkit' not found

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

error: attribute 'oath-toolkit' in selection path 'oath-toolkit' not found

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

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

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/g5rhhczqi6lbrbnvzdxwx33x3qsy9912-oath-toolkit-2.6.2
shrinking /nix/store/g5rhhczqi6lbrbnvzdxwx33x3qsy9912-oath-toolkit-2.6.2/bin/oathtool
shrinking /nix/store/g5rhhczqi6lbrbnvzdxwx33x3qsy9912-oath-toolkit-2.6.2/lib/security/pam_oath.so
shrinking /nix/store/g5rhhczqi6lbrbnvzdxwx33x3qsy9912-oath-toolkit-2.6.2/lib/liboath.so.0.1.3
gzipping man pages under /nix/store/g5rhhczqi6lbrbnvzdxwx33x3qsy9912-oath-toolkit-2.6.2/share/man/
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/g5rhhczqi6lbrbnvzdxwx33x3qsy9912-oath-toolkit-2.6.2/lib  /nix/store/g5rhhczqi6lbrbnvzdxwx33x3qsy9912-oath-toolkit-2.6.2/bin
patching script interpreter paths in /nix/store/g5rhhczqi6lbrbnvzdxwx33x3qsy9912-oath-toolkit-2.6.2
checking for references to /build in /nix/store/g5rhhczqi6lbrbnvzdxwx33x3qsy9912-oath-toolkit-2.6.2...
/nix/store/g5rhhczqi6lbrbnvzdxwx33x3qsy9912-oath-toolkit-2.6.2

@Mic92 Mic92 merged commit 33115bd into NixOS:master Feb 23, 2018
@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Partial log (click to expand)

error: attribute ‘oath-toolkit’ in selection path ‘oath-toolkit’ not found

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/429s1inb5zzaxwwqyy1558vhixnz2v4r-oath-toolkit-2.6.2
shrinking /nix/store/429s1inb5zzaxwwqyy1558vhixnz2v4r-oath-toolkit-2.6.2/bin/oathtool
shrinking /nix/store/429s1inb5zzaxwwqyy1558vhixnz2v4r-oath-toolkit-2.6.2/lib/liboath.so.0.1.3
shrinking /nix/store/429s1inb5zzaxwwqyy1558vhixnz2v4r-oath-toolkit-2.6.2/lib/security/pam_oath.so
gzipping man pages under /nix/store/429s1inb5zzaxwwqyy1558vhixnz2v4r-oath-toolkit-2.6.2/share/man/
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/429s1inb5zzaxwwqyy1558vhixnz2v4r-oath-toolkit-2.6.2/lib  /nix/store/429s1inb5zzaxwwqyy1558vhixnz2v4r-oath-toolkit-2.6.2/bin 
patching script interpreter paths in /nix/store/429s1inb5zzaxwwqyy1558vhixnz2v4r-oath-toolkit-2.6.2
checking for references to /tmp/nix-build-oath-toolkit-2.6.2.drv-0 in /nix/store/429s1inb5zzaxwwqyy1558vhixnz2v4r-oath-toolkit-2.6.2...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@clefru @Mic92 @GrahamcOfBorg