Package: android-platform-tools
Version: 34.0.5-13
Severity: serious
Tags: ftbfs patch
User: [email protected]
Usertags: origin-ubuntu tenacious ubuntu-patch

Dear Maintainer,

With glibc 2.44 and newer system headers, `<linux/types.h>` is included 
transitively when compiling `system/extras/squashfs_utils/squashfs_utils.c`. 
Because `HAVE_LINUX_TYPES_LE16` is not defined in 
`debian/system/extras/libext4_utils.mk`, 
`/usr/include/squashfuse/squashfs_fs.h` defines `typedef uint64_t __le64;`, 
which conflicts with `typedef __u64 __bitwise __le64;` from `<linux/types.h>` 
on 64-bit architectures (`unsigned long` vs `unsigned long long`).

The attached patch adds `-DHAVE_LINUX_TYPES_LE16` to `CPPFLAGS` in 
`debian/system/extras/libext4_utils.mk` so `squashfs_fs.h` uses 
`<linux/types.h>`.
--- a/debian/system/extras/libext4_utils.mk
+++ b/debian/system/extras/libext4_utils.mk
@@ -26,6 +26,7 @@
   -D_LARGEFILE64_SOURCE \
   -DFEC_NO_KLOG \
   -DSQUASHFS_NO_KLOG \
+  -DHAVE_LINUX_TYPES_LE16 \
   -I/usr/include/android \
   -I/usr/include/squashfuse \
   -Isystem/core/libcutils/include \

Reply via email to