diff --git a/trunk/4af4a4a71827c0bc5e0ec67af23edef4f15cee8e.patch b/trunk/4af4a4a71827c0bc5e0ec67af23edef4f15cee8e.patch new file mode 100644 index 0000000..bfcc13b --- /dev/null +++ b/trunk/4af4a4a71827c0bc5e0ec67af23edef4f15cee8e.patch @@ -0,0 +1,30 @@ +diff --git a/lib/fseterr.c b/lib/fseterr.c +index 82649c3ac..adb637256 100644 +--- a/lib/fseterr.c ++++ b/lib/fseterr.c +@@ -29,7 +29,7 @@ fseterr (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h +index 78d896e9f..05c5752a2 100644 +--- a/lib/stdio-impl.h ++++ b/lib/stdio-impl.h +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index cdaec6e..02195f1 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -10,24 +10,32 @@ arch=('x86_64') url="http://lbzip2.org" license=('GPL3') depends=('glibc') -source=(http://archive.lbzip2.org/$pkgname-$pkgver.tar.bz2) -sha512sums=('63468178604df926bd2071c23b068bddcb6fcab54bac92a149224c5ed99a38cc7e8366ae21eecf12ad9c1a193827ef627d2517ac9a7a65791a959dfcacd96127') +source=(http://archive.lbzip2.org/$pkgname-$pkgver.tar.bz2 + 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e.patch) +sha512sums=('63468178604df926bd2071c23b068bddcb6fcab54bac92a149224c5ed99a38cc7e8366ae21eecf12ad9c1a193827ef627d2517ac9a7a65791a959dfcacd96127' + '9f46ee5008c95008ee937faae79a045a5e5af410ca32434720ae97fa9fb05b49c6f7990a77216d850dcfd6dd72f9f95237eebb7ff32d4c4964982a2352df4963') + +prepare() { + cd "${srcdir}"/$pkgname-$pkgver + + patch -p1 -i ../4af4a4a71827c0bc5e0ec67af23edef4f15cee8e.patch +} build() { cd "${srcdir}"/$pkgname-$pkgver - + ./configure --prefix=/usr make } check() { cd "${srcdir}"/$pkgname-$pkgver - + make check } package() { cd "${srcdir}"/$pkgname-$pkgver - + make DESTDIR="${pkgdir}" install }