[oe-commits] Jonathan Cameron : glibc 2.7 and 2.9 (arm): Remove unnecessary asm/page. h include

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 41be021c382908f081a5e92affc08201434e7596
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=41be021c382908f081a5e92affc08201434e7596

Author: Jonathan Cameron <jic23 at cam.ac.uk>
Date:   Mon Aug 17 03:53:00 2009 +0000

glibc 2.7 and 2.9 (arm): Remove unnecessary asm/page.h include

Fix compile bug for arm with recent kernel headers
../ports/sysdeps/unix/sysv/linux/arm/ioperm.c:48:22: error: asm/page.h: No such file or directory

Signed-off-by: Jonathan Cameron <jic23 at cam.ac.uk>
Signed-off-by: Holger Hans Peter Freyther <zecke at selfish.org>

---

 recipes/glibc/glibc_2.7.bb |    3 ++-
 recipes/glibc/glibc_2.9.bb |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes/glibc/glibc_2.7.bb b/recipes/glibc/glibc_2.7.bb
index f152756..dcea69c 100644
--- a/recipes/glibc/glibc_2.7.bb
+++ b/recipes/glibc/glibc_2.7.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
@@ -68,6 +68,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
            file://etc/ld.so.conf \
            file://generate-supported.mk \
            file://march-i686.patch;patch=1;pnum=0 \
+	   file://glibc-arm-no-asm-page.patch;patch=1 \
            "
 
 
diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb
index 6e323aa..9849c0a 100644
--- a/recipes/glibc/glibc_2.9.bb
+++ b/recipes/glibc/glibc_2.9.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
@@ -65,6 +65,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
            file://generate-supported.mk \
            file://march-i686.patch;patch=1;pnum=0 \
 	   file://tls_i486.patch;patch=1 \
+	   file://glibc-arm-no-asm-page.patch;patch=1 \
            "