Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/17 21:54:47+01:00 reciva.com!pb
try harder to use ${KERNEL_CC}

BKrev: 42b34338qhucsS5_D5igv87i6WnYSQ

diff --git a/packages/dri/drm-kernel_cvs.bb b/packages/dri/drm-kernel_cvs.bb
index ee9c73a..2172877 100644 (file)
--- a/packages/dri/drm-kernel_cvs.bb
+++ b/packages/dri/drm-kernel_cvs.bb
@@ -1,8 +1,9 @@
 SECTION = "x11/base"
-PR = "r2"
+PR = "r3"
 LICENSE = "MIT"
 
-SRC_URI = "cvs://anoncvs@dri.freedesktop.org/cvs/dri;module=drm;method=pserver"
+SRC_URI = "cvs://anoncvs@dri.freedesktop.org/cvs/dri;module=drm;method=pserver \
+       file://make.patch;patch=1"
 
 inherit module-base
 
@@ -10,7 +11,8 @@ PV = "0.0cvs${CVSDATE}"
 S = "${WORKDIR}/drm"
 
 do_compile() {
-       oe_runmake -C linux-core LINUXDIR="${KERNEL_SOURCE}" CC="${KERNEL_CC}"
+        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+       oe_runmake -C linux-core LINUXDIR="${KERNEL_SOURCE}" MAKE="make -e" CC="${KERNEL_CC}" LD="${KERNEL_LD}"
 }
 
 do_install() {

diff --git a/packages/dri/make.patch b/packages/dri/make.patch
new file mode 100644 (file)
index 0000000..e69de29