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

rhash: cleanup, 1.3.3 -> 1.3.5 #34214

Closed
wants to merge 1 commit into from
Closed

rhash: cleanup, 1.3.3 -> 1.3.5 #34214

wants to merge 1 commit into from

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jan 24, 2018 •
edited

Motivation for this change

1.3.5: https://github.com/rhash/RHash/releases/tag/v1.3.5
1.3.4: https://github.com/rhash/RHash/releases/tag/v1.3.4

  • cleanup quite a bit
  • port darwin patch--
    don't believe still needed but shouldn't hurt.

Among other things (see release notes), improves support on numerous platforms including aarch64 and musl.

Things done
  • 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.

@grahamc
Copy link
Member

grahamc commented Jan 24, 2018

@GrahamcOfBorg build rhash

GrahamcOfBorg
GrahamcOfBorg reviewed Jan 24, 2018
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: aarch64-linux

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/41nmblwgml8xl88qkfsrgsbwclnnp7z5-rhash-1.3.5
shrinking /nix/store/41nmblwgml8xl88qkfsrgsbwclnnp7z5-rhash-1.3.5/bin/rhash
shrinking /nix/store/41nmblwgml8xl88qkfsrgsbwclnnp7z5-rhash-1.3.5/lib/librhash.so.0
gzipping man pages under /nix/store/41nmblwgml8xl88qkfsrgsbwclnnp7z5-rhash-1.3.5/share/man/
strip is /nix/store/7hccxazjhqkjicq37ijqp6vvwq6isdhy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/41nmblwgml8xl88qkfsrgsbwclnnp7z5-rhash-1.3.5/lib  /nix/store/41nmblwgml8xl88qkfsrgsbwclnnp7z5-rhash-1.3.5/bin
patching script interpreter paths in /nix/store/41nmblwgml8xl88qkfsrgsbwclnnp7z5-rhash-1.3.5
checking for references to /build in /nix/store/41nmblwgml8xl88qkfsrgsbwclnnp7z5-rhash-1.3.5...
/nix/store/41nmblwgml8xl88qkfsrgsbwclnnp7z5-rhash-1.3.5

GrahamcOfBorg
GrahamcOfBorg reviewed Jan 24, 2018
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-darwin

Merge failed

GrahamcOfBorg
GrahamcOfBorg reviewed Jan 24, 2018
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-linux

Merge failed

@dtzWill
Copy link
Member Author

dtzWill commented Feb 5, 2018

@GrahamcOfBorg build rhash cmake

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

Merge failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Partial log (click to expand)

Merge failed

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Merge failed

@dtzWill
Copy link
Member Author

dtzWill commented Feb 5, 2018 •
edited

("fixed" conflicts, although git did it automagically when asked to rebase :D)

@dtzWill
rhash: 1.3.3 -> 1.3.5
f565274 
1.3.5: https://github.com/rhash/RHash/releases/tag/v1.3.5
1.3.4: https://github.com/rhash/RHash/releases/tag/v1.3.4

* still need makefile bug workarounds
* cleanup a bit
* port darwin patch--
  don't believe still needed but shouldn't hurt.
@dtzWill
Copy link
Member Author

dtzWill commented Feb 5, 2018

@GrahamcOfBorg build rhash cmake

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

sed -n '1s/.*/{ global:/p; s/^RHASH_API.* \([a-z0-9_]\+\)(.*/  \1;/p; $s/.*/local: *; };/p' rhash.h rhash_torrent.h rhash_timing.h > exports.sym
clang -fpic  -pipe -DIN_RHASH  -O2 -DNDEBUG -fomit-frame-pointer -ffunction-sections -fdata-sections -Wall -W -Wstrict-prototypes -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wmissing-prototypes -Wmissing-declarations -shared algorithms.c byte_order.c plug_openssl.c rhash.c rhash_timing.c rhash_torrent.c aich.c crc32.c ed2k.c edonr.c hex.c md4.c md5.c sha1.c sha256.c sha512.c sha3.c ripemd-160.c gost.c has160.c snefru.c tiger.c tiger_sbox.c tth.c torrent.c whirlpool.c whirlpool_sbox.c -Wl,--version-script,exports.sym,-soname,librhash.so.0   -o librhash.so.0
ld: unknown option: --version-script
clang-4.0: error: linker command failed with exit code 1 (use -v to see invocation)
make[1]: *** [Makefile:191: librhash.so.0] Error 1
make[1]: Leaving directory '/private/tmp/nix-build-rhash-1.3.5.drv-0/RHash-1.3.5/librhash'
make: *** [Makefile:143: librhash/librhash.0.dylib] Error 2
builder for '/nix/store/hxgzf1yac6dksm54f65r6n050wshiss8-rhash-1.3.5.drv' failed with exit code 2
cannot build derivation '/nix/store/b95nl3md1zkpy5nki5pl4x2mdml2qlsb-cmake-3.10.2.drv': 1 dependencies couldn't be built
error: build of '/nix/store/b95nl3md1zkpy5nki5pl4x2mdml2qlsb-cmake-3.10.2.drv', '/nix/store/hxgzf1yac6dksm54f65r6n050wshiss8-rhash-1.3.5.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/qf32hr8r242dd45ij7ds2bflaiz1m0p9-cmake-3.10.2/bin/cpack
shrinking /nix/store/qf32hr8r242dd45ij7ds2bflaiz1m0p9-cmake-3.10.2/bin/ctest
shrinking /nix/store/qf32hr8r242dd45ij7ds2bflaiz1m0p9-cmake-3.10.2/bin/cmake
strip is /nix/store/xmpjypwjmp2qi1chs5kr0hacnh161ls4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/qf32hr8r242dd45ij7ds2bflaiz1m0p9-cmake-3.10.2/bin
patching script interpreter paths in /nix/store/qf32hr8r242dd45ij7ds2bflaiz1m0p9-cmake-3.10.2
/nix/store/qf32hr8r242dd45ij7ds2bflaiz1m0p9-cmake-3.10.2/share/cmake-3.10/Modules/CPack.STGZ_Header.sh.in: interpreter directive changed from "/bin/sh" to "/nix/store/7fxbh1yhagvwbdrmdyyy5ghcjhwjndhs-bash-4.4-p12/bin/sh"
/nix/store/qf32hr8r242dd45ij7ds2bflaiz1m0p9-cmake-3.10.2/share/cmake-3.10/Modules/Squish4RunTestCase.sh: interpreter directive changed from "/bin/sh" to "/nix/store/7fxbh1yhagvwbdrmdyyy5ghcjhwjndhs-bash-4.4-p12/bin/sh"
/nix/store/qf32hr8r242dd45ij7ds2bflaiz1m0p9-cmake-3.10.2/share/cmake-3.10/Modules/SquishRunTestCase.sh: interpreter directive changed from "/bin/sh" to "/nix/store/7fxbh1yhagvwbdrmdyyy5ghcjhwjndhs-bash-4.4-p12/bin/sh"
checking for references to /build in /nix/store/qf32hr8r242dd45ij7ds2bflaiz1m0p9-cmake-3.10.2...

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/23x14fcwgm1c9mrnjjsgc30r7faq26w9-cmake-3.10.2/bin/ctest
shrinking /nix/store/23x14fcwgm1c9mrnjjsgc30r7faq26w9-cmake-3.10.2/bin/cmake
shrinking /nix/store/23x14fcwgm1c9mrnjjsgc30r7faq26w9-cmake-3.10.2/bin/cpack
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/23x14fcwgm1c9mrnjjsgc30r7faq26w9-cmake-3.10.2/bin 
patching script interpreter paths in /nix/store/23x14fcwgm1c9mrnjjsgc30r7faq26w9-cmake-3.10.2
/nix/store/23x14fcwgm1c9mrnjjsgc30r7faq26w9-cmake-3.10.2/share/cmake-3.10/Modules/Squish4RunTestCase.sh: interpreter directive changed from "/bin/sh" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/sh"
/nix/store/23x14fcwgm1c9mrnjjsgc30r7faq26w9-cmake-3.10.2/share/cmake-3.10/Modules/CPack.STGZ_Header.sh.in: interpreter directive changed from "/bin/sh" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/sh"
/nix/store/23x14fcwgm1c9mrnjjsgc30r7faq26w9-cmake-3.10.2/share/cmake-3.10/Modules/SquishRunTestCase.sh: interpreter directive changed from "/bin/sh" to "/nix/store/yq03c2ny43mc24j7dq5riznzb09ddhpq-bash-4.4-p12/bin/sh"
checking for references to /tmp/nix-build-cmake-3.10.2.drv-0 in /nix/store/23x14fcwgm1c9mrnjjsgc30r7faq26w9-cmake-3.10.2...

@dtzWill
Copy link
Member Author

dtzWill commented Feb 5, 2018

Well this fixes musl and aarch64 for me, but looks like it breaks Darwin.

Looks like upstream is reworking their build to work properly without patches and custom installation phases (including configure script, woo)-- hopefully that wraps up into a release soon.

Closing this for now, although fixing Darwin error is probably not too hard (restore the relevant bit of the patch).

@dtzWill dtzWill closed this Feb 5, 2018
@dtzWill dtzWill mentioned this pull request Feb 5, 2018
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GrahamcOfBorg GrahamcOfBorg GrahamcOfBorg left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dtzWill @grahamc @GrahamcOfBorg