summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2006-11-23 09:18:08 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2006-11-23 09:18:08 +0000
commit01dd03cc0e04ec320fc123c7dcf602d98bf78c07 (patch)
treed6ef81709e4d51978cc1375159df9c8fcd8adf21
parent11a8e6be52e4d102cfc886fc8025d1fa1abe8ae3 (diff)
downloadOSELAS.Toolchain-01dd03cc0e04ec320fc123c7dcf602d98bf78c07.tar.gz
OSELAS.Toolchain-01dd03cc0e04ec320fc123c7dcf602d98bf78c07.tar.xz
* patches/glibc-2.5/generic/series,
patches/glibc-2.5/generic/local-2.6.19-linux-libc-dev.diff: added patch to build glibc-2.5 with samitaeter headers git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/trunks/OSELAS.Toolchain-trunk@1315 f8d472c7-5700-0410-ac5a-87979cec3adf
-rw-r--r--patches/glibc-2.5/generic/local-2.6.19-linux-libc-dev.diff82
-rw-r--r--patches/glibc-2.5/generic/series1
2 files changed, 83 insertions, 0 deletions
diff --git a/patches/glibc-2.5/generic/local-2.6.19-linux-libc-dev.diff b/patches/glibc-2.5/generic/local-2.6.19-linux-libc-dev.diff
new file mode 100644
index 0000000..e984419
--- /dev/null
+++ b/patches/glibc-2.5/generic/local-2.6.19-linux-libc-dev.diff
@@ -0,0 +1,82 @@
+#
+# Submitted-By: Marc Kleine-Budde, 2006-11-23
+# Committed-By: Marc Kleine-Budde
+#
+# Error:
+#
+# glibc cannot be compiled with samitized headers from 2.6.19rc6
+#
+# Description:
+#
+# http://sourceware.org/ml/libc-alpha/2006-10/msg00024.html
+#
+# State:
+#
+# this patch is from ubuntu's glibc-2.5 patch:
+# https://patches.ubuntu.com/g/glibc/glibc_2.5-0ubuntu2.patch
+#
+
+# DP: Description: Add missing bits in 2.6.19 kernel headers
+# DP: Author: Jeff Bailey <jbailey@ubuntu.com>
+# DP: Upstream status: Not Submitted.
+# DP: Status Details: No response on http://sourceware.org/ml/libc-alpha/2006-10/msg00024.html
+# DP: Date: 2006-10-27
+
+Index: glibc-2.5/sysdeps/unix/sysv/linux/check_pf.c
+===================================================================
+--- glibc-2.5.orig/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.5/sysdeps/unix/sysv/linux/check_pf.c
+@@ -30,10 +30,15 @@
+ #include <asm/types.h>
+ #include <linux/netlink.h>
+ #include <linux/rtnetlink.h>
++#include <linux/if_addr.h>
+
+ #include <not-cancel.h>
+ #include <kernel-features.h>
+
++#define IFLA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
++#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg))
++#define IFA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
++#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg))
+
+ #ifndef IFA_F_TEMPORARY
+ # define IFA_F_TEMPORARY IFA_F_SECONDARY
+Index: glibc-2.5/sysdeps/unix/sysv/linux/if_index.c
+===================================================================
+--- glibc-2.5.orig/sysdeps/unix/sysv/linux/if_index.c
++++ glibc-2.5/sysdeps/unix/sysv/linux/if_index.c
+@@ -28,9 +28,14 @@
+ #include <sys/ioctl.h>
+ #include <bits/libc-lock.h>
+ #include <not-cancel.h>
++#include <linux/if_addr.h>
+
+ #include "netlinkaccess.h"
+
++#define IFA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
++#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg))
++#define IFLA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
++#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg))
+
+ /* Variable to signal whether SIOCGIFCONF is not available. */
+ # if __ASSUME_SIOCGIFNAME == 0
+Index: glibc-2.5/sysdeps/unix/sysv/linux/ifaddrs.c
+===================================================================
+--- glibc-2.5.orig/sysdeps/unix/sysv/linux/ifaddrs.c
++++ glibc-2.5/sysdeps/unix/sysv/linux/ifaddrs.c
+@@ -33,9 +33,14 @@
+ #include <sysdep.h>
+ #include <time.h>
+ #include <unistd.h>
++#include <linux/if_addr.h>
+
+ #include "netlinkaccess.h"
+
++#define IFLA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
++#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg))
++#define IFA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
++#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg))
+
+ /* We don't know if we have NETLINK support compiled in in our
+ Kernel, so include the old implementation as fallback. */
diff --git a/patches/glibc-2.5/generic/series b/patches/glibc-2.5/generic/series
index 5782429..1751c7f 100644
--- a/patches/glibc-2.5/generic/series
+++ b/patches/glibc-2.5/generic/series
@@ -5,3 +5,4 @@ configure_in-sane_readelf.diff
configure-sane_readelf.diff
sysdeps_unix_sysv_linux_getcwd_c-MAX.diff
+local-2.6.19-linux-libc-dev.diff