JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libfpx: pull upstream fix for -fno-common toolchains

Browse Source 
Without the change build fails on upstream gcc-10 as:

    ld: ri_image/.libs/libRiImage.a(cp_jpeg.o):/build/libfpx-1.3.1-7/ri_image/../jpeg/ejpeg.h:35:
      multiple definition of `No_JPEG_Header_Flag'; jpeg/.libs/libJpeg.a(enctile.o):/build/libfpx-1.3.1-7/jpeg/ejpeg.h:35: first defined here
This commit is contained in:
Sergei Trofimovich 2022-05-17 10:41:47 +01:00
parent 6323f3ccba
commit 6fd83b70a9
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/libfpx/default.nix
View File

@ -17,13 +17,15 @@ stdenv.mkDerivation rec {
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch?id=f28a947813dbc0a1fd1a8d4a712d58a64c48ca01";
sha256 = "032y8110zgnkdhkdq3745zk53am1x34d912rai8q70k3sskyq22p";
})
# Pull upstream fix for -fno-common:
# https://github.com/ImageMagick/libfpx/pull/1
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/ImageMagick/libfpx/commit/c32b340581ba6c88c5092f374f655c7579b598a6.patch";
sha256 = "1gbc0qb2ri1mj9r66wx0yn28fsr7zhhlyz2mwbica8wh34xijgz9";
})
];
# This dead code causes a duplicate symbol error in Clang so just remove it
postPatch = if stdenv.cc.isClang then ''
substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" ""
'' else null;
meta = with lib; {
homepage = "http://www.imagemagick.org";
description = "A library for manipulating FlashPIX images";