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

udftools: fix compiling with gcc5 and turn off fortify

Browse Source
This commit is contained in:
Robin Gloster 2016-02-07 23:27:47 +00:00
parent 0c5b86b607
commit 801b80299c
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/tools/filesystems/udftools/default.nix
View File

@ -10,6 +10,9 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses readline ];
patches = [ ./gcc5.patch ];
hardening_fortify = false;
preConfigure = ''
sed -e '1i#include <limits.h>' -i cdrwtool/cdrwtool.c -i pktsetup/pktsetup.c
sed -e 's@[(]char[*][)]spm [+]=@spm = ((char*) spm) + @' -i wrudf/wrudf.c

17
pkgs/tools/filesystems/udftools/gcc5.patch Normal file
View File

@ -0,0 +1,17 @@
--- udftools-1.0.0b3/libudffs/desc.c 2016-02-07 23:21:38.595391610 +0000
+++ udftools-1.0.0b3/libudffs/desc.c 2016-02-07 23:21:57.759756269 +0000
@@ -34,12 +34,12 @@
#include "libudffs.h"
#include "config.h"
-inline struct impUseVolDescImpUse *query_iuvdiu(struct udf_disc *disc)
+extern struct impUseVolDescImpUse *query_iuvdiu(struct udf_disc *disc)
{
return (struct impUseVolDescImpUse *)disc->udf_iuvd[0]->impUse;
}
-inline struct logicalVolIntegrityDescImpUse *query_lvidiu(struct udf_disc *disc)
+extern struct logicalVolIntegrityDescImpUse *query_lvidiu(struct udf_disc *disc)
{
return (struct logicalVolIntegrityDescImpUse *)&(disc->udf_lvid->impUse[le32_to_cpu(disc->udf_lvd[0]->numPartitionMaps) * 2 * sizeof(uint32_t)]);
}