From 8b87f7c56205f5354660f849b74c2c09eda58e28 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 9 May 2005 18:55:46 +0000 Subject: Both uclibc bits/ipc.h (this comes from uclibc) and the kernel linux/posix_types.h define __kernel_key_t. This means that an app which includes both in one file will fail compilation. The patch fixes this by changing the typedef used inside bits/ipc.h to the same one used in the glibc headers (identical to the type from posix_types.h). Unfortunately this means that any uclibc only package which relied on this will now fail (but it would have failed on glibc anyway), therefore this patch is made NSLU2 specific because it has only received complete testing on NSLU2. This bug affects samba 3.0 builds on uclibc - without this fix samba 3.0.x will not build on uclibc. BKrev: 427fb232lDR4ZUgoXLYunOoObOvvyg --- packages/uclibc/uclibc_0.9.27.bb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'packages/uclibc/uclibc_0.9.27.bb') diff --git a/packages/uclibc/uclibc_0.9.27.bb b/packages/uclibc/uclibc_0.9.27.bb index 65552b61bb..d7630b74b3 100644 --- a/packages/uclibc/uclibc_0.9.27.bb +++ b/packages/uclibc/uclibc_0.9.27.bb @@ -1,10 +1,19 @@ DEFAULT_PREFERENCE = "1" -PR = "r4" +PR = "r5" include uclibc.inc +# This patch removes the typedef of __kernel_key_t from +# include/bits/ipc.h. Because this removes a typedef some +# packages which relied on it (erroneously - it is defined +# in include/linux/posix_types.h and is internal) may stop +# building. The patch has only been verified on NSLU2 builds. +PATCH_ipc_h ?= +PATCH_ipc_h_nslu2 = "file://kernel-key-t-ipc.h.patch;patch=1" + SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \ file://dyn-ldconfig.patch;patch=1 \ file://nokernelheadercheck.patch;patch=1" SRC_URI += " file://armeb-kernel-stat.h.patch;patch=1" +SRC_URI += ${PATCH_ipc_h} S = "${WORKDIR}/uClibc-${PV}" -- cgit v1.2.3