summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini <ponce@slackbuilds.org>2016-07-12 15:06:42 +0200
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2016-07-17 07:49:40 +0700
commitecd45b8a4570a6d6e12194e15b17c0c8a0e9d8bd (patch)
tree73fa4509884c263cd4fc25bc0b198909466e0e31
parent1100b774509d6c39992e5199aa0f4e98c9686e07 (diff)
downloadslackbuilds-ecd45b8a4570a6d6e12194e15b17c0c8a0e9d8bd.tar.gz
slackbuilds-ecd45b8a4570a6d6e12194e15b17c0c8a0e9d8bd.tar.xz
system/udftools: Fix building with gcc-5.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--system/udftools/udftools-1.0.0b3-gcc5.patch13
-rw-r--r--system/udftools/udftools.SlackBuild7
2 files changed, 19 insertions, 1 deletions
diff --git a/system/udftools/udftools-1.0.0b3-gcc5.patch b/system/udftools/udftools-1.0.0b3-gcc5.patch
new file mode 100644
index 0000000000..244683c5b0
--- /dev/null
+++ b/system/udftools/udftools-1.0.0b3-gcc5.patch
@@ -0,0 +1,13 @@
+--- udftools-1.0.0b3/include/libudffs.h 2004-02-23 04:33:11.000000000 +0100
++++ udftools-1.0.0b3/include/libudffs.h 2015-06-27 18:53:17.000000000 +0200
+@@ -169,8 +169,8 @@
+ struct udf_data *alloc_data(void *, int);
+
+ /* desc.c */
+-inline struct impUseVolDescImpUse *query_iuvdiu(struct udf_disc *);
+-inline struct logicalVolIntegrityDescImpUse *query_lvidiu(struct udf_disc *);
++extern inline struct impUseVolDescImpUse *query_iuvdiu(struct udf_disc *);
++extern inline struct logicalVolIntegrityDescImpUse *query_lvidiu(struct udf_disc *);
+
+ /* file.c */
+ tag query_tag(struct udf_disc *, struct udf_extent *, struct udf_desc *, uint16_t);
diff --git a/system/udftools/udftools.SlackBuild b/system/udftools/udftools.SlackBuild
index 513700b941..8f209ab7a5 100644
--- a/system/udftools/udftools.SlackBuild
+++ b/system/udftools/udftools.SlackBuild
@@ -23,7 +23,7 @@
PRGNAM=udftools
VERSION=${VERSION:-1.0.0b3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -53,6 +53,8 @@ else
LIBDIRSUFFIX=""
fi
+set -e
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
@@ -68,6 +70,9 @@ find -L . \
patch -p1 < $CWD/fix-compiler-errors.patch
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778153
+patch -p1 < $CWD/udftools-1.0.0b3-gcc5.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \