commit b9dd4fc538c600778e6348267ea45a00f4088756 Author: Juergen Daubert <jue@jue.li> Date: Thu Jan 17 09:55:33 2019 +0100 reiserfsprogs: fix build with glibc 2.28 diff --git a/reiserfsprogs/.signature b/reiserfsprogs/.signature index 624eb8ad2..e4de51ea0 100644 --- a/reiserfsprogs/.signature +++ b/reiserfsprogs/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bcOKL8mRBuGIeq/lNx+xNaSjkNt0V4c3IUtqz72etMbD0e7RH/KEkLkxIJ+gISHAfqnROk95dcGAxPRmJ5algU= -SHA256 (Pkgfile) = 64e2b8f0befde9fff05009988108f9195b5c9bad54ed9d7a5bdd74f13176cf12 +RWSE3ohX2g5d/TCcncfvP7Bw/CA0wSPfOZxaFSCqCLa08j2DwuaGGBxr9BSHIIhpOLgc/mA54OjvAYMBODDdZLQ8SD7Bck7jSgM= +SHA256 (Pkgfile) = c3a6fef373b6b95cf079eeeff8f8f6913bd5399fab586e75b2e2747010b6f895 SHA256 (.footprint) = 70da443ad9001947ee98a1a3280170fbb29baa4dbb48f1901d7bf612bb8c8136 SHA256 (reiserfsprogs-3.6.27.tar.xz) = 0e95b67fa7746a3c2d59145e9b9c2feb4a6be52853e83b497b182eae508e62e3 +SHA256 (reiserfsprogs-3.6.27-loff_t.patch) = 2d4e90d5e2b0610021d0c078f350e098d5573edccdf2864909aada83ed0473f9 diff --git a/reiserfsprogs/Pkgfile b/reiserfsprogs/Pkgfile index 3013473ae..205013d99 100644 --- a/reiserfsprogs/Pkgfile +++ b/reiserfsprogs/Pkgfile @@ -5,12 +5,17 @@ name=reiserfsprogs version=3.6.27 -release=1 -source=(https://www.kernel.org/pub/linux/kernel/people/jeffm/$name/v$version/$name-$...) +release=2 +source=(https://www.kernel.org/pub/linux/kernel/people/jeffm/$name/v$version/$name-$... + $name-$version-loff_t.patch) build () { cd $name-$version + #fix build with glibc 2.28 + patch -p1 -i $SRC/$name-$version-loff_t.patch + autoreconf -i + ./configure --prefix=/usr --sbindir=/sbin make diff --git a/reiserfsprogs/reiserfsprogs-3.6.27-loff_t.patch b/reiserfsprogs/reiserfsprogs-3.6.27-loff_t.patch new file mode 100644 index 000000000..9ab8519e7 --- /dev/null +++ b/reiserfsprogs/reiserfsprogs-3.6.27-loff_t.patch @@ -0,0 +1,16 @@ +glibc-2.28 did hide loff_t indef system-specific macros: + https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=663e7d784977f6b15c0ca... + +This caused build failure: + ../include/reiserfs_lib.h:300:55: error: unknown type name 'loff_t'; did you mean 'off_t'? + +Re-enable extensions to pull loff_t back. + +https://bugs.gentoo.org/663930 +--- a/configure.ac ++++ b/configure.ac +@@ -23,2 +23,4 @@ AC_PROG_MAKE_SET + AC_PROG_LIBTOOL ++dnl pull in loff_t from glibc ++AC_USE_SYSTEM_EXTENSIONS +