commit 68d2543747ea1af875abeb73a417dbe55c937344 Author: Juergen Daubert <jue@jue.li> Date: Thu Jan 17 15:10:29 2019 +0100 jfsutils: fix build with glibc 2.28 diff --git a/jfsutils/.signature b/jfsutils/.signature index f227710f9..6f84d9ad6 100644 --- a/jfsutils/.signature +++ b/jfsutils/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/c8vDaBsAudQi1tDq+4CZ/srVEw156Xyn+xdJal+HLL8gry4kc/kYetg/fJtW698k3R+ZyuZ9FcqDAiAgN3ybAs= -SHA256 (Pkgfile) = 32d66e2873b414e46c55d6892f3ace2dbed84b22ff95f14952fe25734c740db0 +RWSE3ohX2g5d/Yb2HEuBsswY9N8XJiBDknUM3h6F+SPjW+Dt9aUMRrhpXb2EVY5RNzOkv6TekiIyyhE99hMKl3bPDwXnSl6MvwA= +SHA256 (Pkgfile) = e1dc913bec4f0cc7f8956f7d265ffa9c1edf263f3fa461ab80e114db6490b7a3 SHA256 (.footprint) = 6ad036b3c0fb99e5f6cf7b4ee8834392de5c4aa20f6aa31af3900de9b5a7e188 SHA256 (jfsutils-1.1.15.tar.gz) = 244a15f64015ce3ea17e49bdf6e1a0fb4f9af92b82fa9e05aa64cb30b5f07a4d SHA256 (inttypes.patch) = 15ea88350c240b23fe322d4adafbb79c8473b9850495d61efafc7bf68be391b3 +SHA256 (sysmacros.patch) = fd1a4e794a3bf2ebdb4b81f582e147655d70aadd59689aacea0ccc32c6381a28 diff --git a/jfsutils/Pkgfile b/jfsutils/Pkgfile index 06696d4d4..d3ef3cb8e 100644 --- a/jfsutils/Pkgfile +++ b/jfsutils/Pkgfile @@ -5,15 +5,21 @@ name=jfsutils version=1.1.15 -release=3 -source=(http://jfs.sourceforge.net/project/pub/$name-$version.tar.gz inttypes.patch) +release=4 +source=(http://jfs.sourceforge.net/project/pub/$name-$version.tar.gz + inttypes.patch sysmacros.patch) build() { cd $name-$version + patch -p1 -i $SRC/inttypes.patch + patch -p1 -i $SRC/sysmacros.patch + ./configure --prefix=/ --mandir=/usr/share/man + make make DESTDIR=$PKG install + ln -sf jfs_mkfs $PKG/sbin/mkfs.jfs ln -sf jfs_fsck $PKG/sbin/fsck.jfs ln -sf jfs_mkfs.8 $PKG/usr/share/man/man8/mkfs.jfs.8 diff --git a/jfsutils/sysmacros.patch b/jfsutils/sysmacros.patch new file mode 100644 index 000000000..82f9d632a --- /dev/null +++ b/jfsutils/sysmacros.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/580056 + +--- a/libfs/devices.c ++++ b/libfs/devices.c +@@ -30,6 +30,10 @@ + #include <stdio.h> + #include <stdlib.h> + ++#if HAVE_SYS_SYSMACROS_H ++#include <sys/sysmacros.h> ++#endif ++ + #ifdef HAVE_SYS_MOUNT_H + #ifdef HAVE_SYS_PARAM_H + #include <sys/param.h>