crackxls: pull patch pending upstream inclusion for -fno-common toolchains
Without the change build fails on upstream gcc-10 as: ld: decrypt.o:/build/crackxls2003/decrypt.c:50: multiple definition of `real_key'; crackxls2003.o:/build/crackxls2003/crackxls2003.c:64: first defined here While at it dropped -O5 -march=native default optimization flags.
This commit is contained in:
parent
99b94f9522
commit
27d4a6453f
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, openssl, libgsf, gmp }:
|
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, autoconf, automake, openssl, libgsf, gmp }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
|
||||||
|
@ -12,9 +12,22 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz";
|
sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Pull patch pending upstream inclusion for -fno-common support:
|
||||||
|
# https://github.com/GavinSmith0123/crackxls2003/pull/3
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fno-common.patch";
|
||||||
|
url = "https://github.com/GavinSmith0123/crackxls2003/commit/613d6c1844f76c7b67671aaa265375fed56c2a56.patch";
|
||||||
|
sha256 = "1pk67x67d9wji576mc57z5bzqlf9ygvn9m1z47w12mad7qmj9h1n";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config autoconf automake ];
|
nativeBuildInputs = [ pkg-config autoconf automake ];
|
||||||
buildInputs = [ openssl libgsf gmp ];
|
buildInputs = [ openssl libgsf gmp ];
|
||||||
|
|
||||||
|
# Avoid "-O5 -march=native"
|
||||||
|
makeFlags = [ "OPTIM_FLAGS=" ];
|
||||||
|
|
||||||
installPhase =
|
installPhase =
|
||||||
''
|
''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
|
|
Loading…
Reference in a new issue