summaryrefslogtreecommitdiff
path: root/source/a/jfsutils
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/jfsutils')
-rwxr-xr-xsource/a/jfsutils/jfsutils.SlackBuild2
-rw-r--r--source/a/jfsutils/jfsutils.glibc228.diff10
-rw-r--r--source/a/jfsutils/jfsutils.inttypes.h.diff11
3 files changed, 23 insertions, 0 deletions
diff --git a/source/a/jfsutils/jfsutils.SlackBuild b/source/a/jfsutils/jfsutils.SlackBuild
index 1c9496d8..1e3937ac 100755
--- a/source/a/jfsutils/jfsutils.SlackBuild
+++ b/source/a/jfsutils/jfsutils.SlackBuild
@@ -70,6 +70,8 @@ find . \
# Fix build with recent glibc:
sed "s@<unistd.h>@&\n#include <sys/types.h>@g" -i fscklog/extract.c
+zcat $CWD/jfsutils.glibc228.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/jfsutils.inttypes.h.diff.gz | patch -p1 --verbose || exit 1
CFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/source/a/jfsutils/jfsutils.glibc228.diff b/source/a/jfsutils/jfsutils.glibc228.diff
new file mode 100644
index 00000000..2d930edd
--- /dev/null
+++ b/source/a/jfsutils/jfsutils.glibc228.diff
@@ -0,0 +1,10 @@
+--- ./libfs/devices.c.orig 2009-03-23 10:37:05.000000000 -0500
++++ ./libfs/devices.c 2018-09-18 18:51:00.699063404 -0500
+@@ -40,6 +40,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
++#include <sys/sysmacros.h>
+ #if defined(__DragonFly__)
+ #include <machine/param.h>
+ #include <sys/diskslice.h>
diff --git a/source/a/jfsutils/jfsutils.inttypes.h.diff b/source/a/jfsutils/jfsutils.inttypes.h.diff
new file mode 100644
index 00000000..51be7e33
--- /dev/null
+++ b/source/a/jfsutils/jfsutils.inttypes.h.diff
@@ -0,0 +1,11 @@
+--- ./libfs/devices.h.orig 2005-11-22 14:43:55.000000000 -0600
++++ ./libfs/devices.h 2018-09-19 01:55:37.960336102 -0500
+@@ -40,6 +40,8 @@
+ #define ERROR_INVALID_PARAMETER 87
+ #define ERROR_DISK_FULL 112
+
++#include <inttypes.h>
++
+ struct stat;
+
+ int ujfs_get_dev_size(FILE *, int64_t * size);