diff options
| author | Robin Gloster <mail@glob.in> | 2016-02-07 23:27:47 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-07 23:41:22 +0000 |
| commit | 801b80299c0fad477b906b9fe921f988a237cdb5 (patch) | |
| tree | ea680778f3088dfd3f39211a89f2ca498cbae978 /pkgs/tools | |
| parent | 0c5b86b607b3a40a468c45d6a98d9c2b86860e80 (diff) | |
| download | nixlib-801b80299c0fad477b906b9fe921f988a237cdb5.tar nixlib-801b80299c0fad477b906b9fe921f988a237cdb5.tar.gz nixlib-801b80299c0fad477b906b9fe921f988a237cdb5.tar.bz2 nixlib-801b80299c0fad477b906b9fe921f988a237cdb5.tar.lz nixlib-801b80299c0fad477b906b9fe921f988a237cdb5.tar.xz nixlib-801b80299c0fad477b906b9fe921f988a237cdb5.tar.zst nixlib-801b80299c0fad477b906b9fe921f988a237cdb5.zip | |
udftools: fix compiling with gcc5 and turn off fortify
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/filesystems/udftools/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/udftools/gcc5.patch | 17 |
2 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix index 329950f8969b..d3964b1e4275 100644 --- a/pkgs/tools/filesystems/udftools/default.nix +++ b/pkgs/tools/filesystems/udftools/default.nix @@ -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 diff --git a/pkgs/tools/filesystems/udftools/gcc5.patch b/pkgs/tools/filesystems/udftools/gcc5.patch new file mode 100644 index 000000000000..2c57ff20e135 --- /dev/null +++ b/pkgs/tools/filesystems/udftools/gcc5.patch @@ -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)]); + } |