From: Andrea Adami Date: Mon, 16 Aug 2010 17:16:45 +0000 (+0200) Subject: klibc: remove superfluous KLIBCARCHINCFLAGS patch X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a55666696bc695b8221bf3e4079c7497fcb636d0;p=openembedded.git klibc: remove superfluous KLIBCARCHINCFLAGS patch * OE patch went upstream with 1.5.19 (28da73a8add68f4abf68c417ac9559acc5d06861) * OpenEmbedded patch c/o Khem Raj. Thx. --- diff --git a/recipes/klibc/klibc-1.5.19/klibc-x86-KLIBCARCHINCFLAGS.patch b/recipes/klibc/klibc-1.5.19/klibc-x86-KLIBCARCHINCFLAGS.patch deleted file mode 100644 index 65de61fa9e..0000000000 --- a/recipes/klibc/klibc-1.5.19/klibc-x86-KLIBCARCHINCFLAGS.patch +++ /dev/null @@ -1,21 +0,0 @@ -On newer kernels the arch dirs for x86 and x86_64 are merged into x86 -but klibc does not know that. This patch teaches it where to look at -for the include files when KLIBCARCH=i386. Its already fixed when -KLIBCARCH=x86_64 - --Khem - -Index: klibc-1.5.18/usr/klibc/arch/i386/MCONFIG -=================================================================== ---- klibc-1.5.18.orig/usr/klibc/arch/i386/MCONFIG 2010-07-01 15:36:11.175170001 -0700 -+++ klibc-1.5.18/usr/klibc/arch/i386/MCONFIG 2010-07-01 15:36:57.875169996 -0700 -@@ -26,6 +26,9 @@ KLIBCARCHREQFLAGS += $(gcc_m32_option) - - KLIBCBITSIZE = 32 - -+# Asm includes for i3?6 are in the merged x86 tree -+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include -+ - # Extra linkflags when building the shared version of the library - # This address needs to be reachable using normal inter-module - # calls, and work on the memory models for this architecture diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc index c0e08b2703..9111dde9e6 100644 --- a/recipes/klibc/klibc.inc +++ b/recipes/klibc/klibc.inc @@ -37,7 +37,6 @@ SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \ file://arm-signal-cleanup.patch \ file://socket.h.patch \ file://isystem.patch \ - file://klibc-x86-KLIBCARCHINCFLAGS.patch \ file://getrusage.patch \ "