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

libewf: fix build with gcc 5

Browse Source 
Fixes #15289.
This commit is contained in:
Gabriel Ebner 2016-06-25 18:21:25 +01:00
parent 9ef6dceca9
commit 75d1e986a7
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch Normal file
View File

@ -0,0 +1,20 @@
Patch from Debian:
https://sources.debian.net/data/main/libe/libewf/20140608-6/debian/patches/04-fix-FTBFS-GCC5.patch
Description: fix a FTBFS with GCC-5. Thanks to Linn Crosetto <linn@hp.com> for
the first fix (see #777938). This patch closes #777945.
Author: Joao Eriberto Mota Filho <eriberto@debian.org>
Last-Update: 2015-07-02
Index: libewf-20140608/libuna/Makefile.am
===================================================================
--- libewf-20140608.orig/libuna/Makefile.am
+++ libewf-20140608/libuna/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/common \
@LIBCSTRING_CPPFLAGS@ \
- @LIBCERROR_CPPFLAGS@
+ @LIBCERROR_CPPFLAGS@ -std=gnu89
noinst_LTLIBRARIES = libuna.la

7
pkgs/development/libraries/libewf/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, zlib, openssl, libuuid, file, fuse }: { fetchurl, stdenv, zlib, openssl, libuuid, file, fuse, autoreconfHook, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "20140608"; version = "20140608";
@ -8,15 +8,16 @@ stdenv.mkDerivation rec {
sha256 = "0wfsffzxk934hl8cpwr14w8ixnh8d23x0xnnzcspjwi2c7730h6i"; sha256 = "0wfsffzxk934hl8cpwr14w8ixnh8d23x0xnnzcspjwi2c7730h6i";
}; };
preConfigure = ''sed -e 's@/usr/bin/file@file@g' -i configure''; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ zlib openssl libuuid ]; buildInputs = [ zlib openssl libuuid ];
patches = [ ./04-fix-FTBFS-GCC5.patch ];
meta = { meta = {
description = "Library for support of the Expert Witness Compression Format"; description = "Library for support of the Expert Witness Compression Format";
homepage = http://sourceforge.net/projects/libewf/; homepage = http://sourceforge.net/projects/libewf/;
license = stdenv.lib.licenses.lgpl3; license = stdenv.lib.licenses.lgpl3;
maintainers = [ stdenv.lib.maintainers.raskin ] ; maintainers = [ stdenv.lib.maintainers.raskin ] ;
platforms = stdenv.lib.platforms.unix;
inherit version; inherit version;
}; };
} }