Author: jow Date: 2015-06-25 13:19:23 +0200 (Thu, 25 Jun 2015) New Revision: 46125
Added: trunk/package/boot/grub2/patches/100-musl-compat.patch Log: grub2: fix build against musl Invert the `__GLIBC__` guards into `!__UCLIBC__` ones to avoid invalid references to `_llseek` on musl. Signed-off-by: Jo-Philipp Wich <[email protected]> Added: trunk/package/boot/grub2/patches/100-musl-compat.patch =================================================================== --- trunk/package/boot/grub2/patches/100-musl-compat.patch (rev 0) +++ trunk/package/boot/grub2/patches/100-musl-compat.patch 2015-06-25 11:19:23 UTC (rev 46125) @@ -0,0 +1,26 @@ +--- a/grub-core/osdep/unix/hostdisk.c ++++ b/grub-core/osdep/unix/hostdisk.c +@@ -48,11 +48,10 @@ + #ifdef __linux__ + # include <sys/ioctl.h> /* ioctl */ + # include <sys/mount.h> +-# if !defined(__GLIBC__) || \ +- ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))) ++# if defined(__UCLIBC__) + /* Maybe libc doesn't have large file support. */ + # include <linux/unistd.h> /* _llseek */ +-# endif /* (GLIBC < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR < 1)) */ ++# endif /* __UCLIBC__ */ + #endif /* __linux__ */ + + grub_uint64_t +@@ -79,8 +78,7 @@ grub_util_get_fd_size (grub_util_fd_t fd + return st.st_size; + } + +-#if defined(__linux__) && (!defined(__GLIBC__) || \ +- ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1)))) ++#if defined(__linux__) && defined(__UCLIBC__) + /* Maybe libc doesn't have large file support. */ + int + grub_util_fd_seek (grub_util_fd_t fd, grub_uint64_t off) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
