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

btrfsProgs: Cleanup some old build changes

Browse Source 
The change of optimization flags should be safe for all platforms as
the default for most applications is -O2. It is also unecessary to
forcefully link against libgcc_s as btrfsprogs no longer errors when
scrubbing without this linkage.
This commit is contained in:
William A. Kennington III 2015-07-10 11:07:39 -07:00
parent fc7c18a992
commit b2ae45bd77
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/tools/filesystems/btrfsprogs/default.nix
View File

@ -1,9 +1,10 @@
{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo { stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
}:
let version = "4.1.1"; in let version = "4.1.1"; in
stdenv.mkDerivation (rec { stdenv.mkDerivation rec {
name = "btrfs-progs-${version}"; name = "btrfs-progs-${version}";
src = fetchurl { src = fetchurl {
@ -16,10 +17,9 @@ stdenv.mkDerivation (rec {
asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
]; ];
# for btrfs to get the rpath to libgcc_s, needed for pthread_cancel to work # gcc bug with -O1 on ARM with gcc 4.8
NIX_CFLAGS_LINK = "-lgcc_s"; # This should be fine on all platforms so apply universally
patchPhase = "sed -i s/-O1/-O2/ configure";
makeFlags = "prefix=$(out)";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Utilities for the btrfs filesystem"; description = "Utilities for the btrfs filesystem";
@ -28,7 +28,4 @@ stdenv.mkDerivation (rec {
maintainers = with maintainers; [ raskin wkennington ]; maintainers = with maintainers; [ raskin wkennington ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} // (if stdenv.isArm then { }
# gcc bug with -O1 on ARM
patchPhase = "sed -i s/-O1/-O2/ configure";
} else {}))