b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #173865 from trofi/workaround-fno-common-for-jpeg-archive

Browse source 
jpeg-archive: add -fcommon workaround
This commit is contained in:
Rick van Schijndel 2022-05-21 16:00:51 +02:00 committed by GitHub
parent 51e10e5356 ed01f5bd6d
commit 35e19f9daa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/graphics/jpeg-archive/default.nix
View file

@ -21,6 +21,12 @@ stdenv.mkDerivation {
substituteInPlace Makefile --replace 'LIBJPEG =' 'LIBJPEG ?='
'';
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: src/util.o:(.bss+0x0): multiple definition of `progname'; /build/ccBZT2Za.o:(.bss+0x20): first defined here
# https://github.com/danielgtaylor/jpeg-archive/issues/119
NIX_CFLAGS_COMPILE = "-fcommon";
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"PREFIX=$(out)"