From 30a2010a12c035fea8ed7990947d33326cdbfc7f Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Mon, 6 Feb 2023 11:01:00 +1300 Subject: glibc: drop caddr_t patch We've been carrying around this patch for ages. It was first added in commit 42e908c4 ("libc/glibc: workaround for autoconf'ed define of caddr_t") and ported to glibc-2.13 in commit de6b6733 ("libc/glibc: add patch to avoid caddr_t redefinition"). It has been ported to every new version of glibc ever since. It's not immediately obvious that the original problem still affects modern glibc versions. If there is a problem it hasn't been reported to the glibc maintainers in the 12 years since it was first seen. It could be that ct-ng is unique in the way we support canadian builds or that there was another fix for the same problem applied upstream sometime in the last 12 years. Drop the patch now to stop in being propagated blindly to new glibc versions. Doing it as a separate commit (as opposed to dropping it in the previous commit which bumped the version) allows the decision to be documented and if this turns out to be wrong it can be easily reverted. Signed-off-by: Chris Packham --- packages/glibc/2.37/0000-typedef-caddr.patch | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 packages/glibc/2.37/0000-typedef-caddr.patch (limited to 'packages/glibc') diff --git a/packages/glibc/2.37/0000-typedef-caddr.patch b/packages/glibc/2.37/0000-typedef-caddr.patch deleted file mode 100644 index a328da1c..00000000 --- a/packages/glibc/2.37/0000-typedef-caddr.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - posix/sys/types.h | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/posix/sys/types.h -+++ b/posix/sys/types.h -@@ -112,7 +112,10 @@ - #ifdef __USE_MISC - # ifndef __daddr_t_defined - typedef __daddr_t daddr_t; -+# if ! defined(caddr_t) && ! defined(__caddr_t_defined) - typedef __caddr_t caddr_t; -+# define __caddr_t_defined -+# endif - # define __daddr_t_defined - # endif - #endif -- cgit v1.2.3