CVS version doesn't need the autofoo mumbo anymore

BKrev: 42304118Y_B8CzUyMLXPsIwZ_5G9OA

diff --git a/packages/ice/ice_cvs.bb b/packages/ice/ice_cvs.bb
index 00b96b1..7f05046 100644 (file)
--- a/packages/ice/ice_cvs.bb
+++ b/packages/ice/ice_cvs.bb
@@ -7,8 +7,7 @@ DEPENDS = "x11"
 DESCRIPTION = "X11 ICE library"
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=ICE \
-          file://autofoo.patch;patch=1"
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=ICE"
 S = "${WORKDIR}/ICE"
 
 inherit autotools pkgconfig 

diff --git a/packages/libsm/libsm_cvs.bb b/packages/libsm/libsm_cvs.bb
index eb3fb0e..056e330 100644 (file)
--- a/packages/libsm/libsm_cvs.bb
+++ b/packages/libsm/libsm_cvs.bb
@@ -7,8 +7,7 @@ DEPENDS = "x11 ice"
 DESCRIPTION = "Session management library"
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=SM \
-          file://autofoo.patch;patch=1"
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=SM"
 S = "${WORKDIR}/SM"
 
 inherit autotools pkgconfig 

diff --git a/packages/libxcursor/libxcursor_cvs.bb b/packages/libxcursor/libxcursor_cvs.bb
index 53d38b8..96b0da6 100644 (file)
--- a/packages/libxcursor/libxcursor_cvs.bb
+++ b/packages/libxcursor/libxcursor_cvs.bb
@@ -7,8 +7,7 @@ DESCRIPTION = "X Cursor library"
 DEPENDS = "libxfixes"
 PR = "r2"
 
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xcursor \
-          file://autofoo.patch;patch=1"
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xcursor"
 S = "${WORKDIR}/Xcursor"
 FILES_${PN} += "${libdir}/libXcursor.so"
 

diff --git a/packages/xt/xt_cvs.bb b/packages/xt/xt_cvs.bb
index 0976320..6b611c3 100644 (file)
--- a/packages/xt/xt_cvs.bb
+++ b/packages/xt/xt_cvs.bb
@@ -6,12 +6,27 @@ DEPENDS = "x11 libsm"
 DESCRIPTION = "X Toolkit Intrinsics"
 LICENSE =  "X-MIT"
 PR = "r1"
-SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xt \
-          file://autofoo.patch;patch=1"
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xt"
 S = "${WORKDIR}/Xt"
 
 inherit autotools pkgconfig 
 
+
+do_compile() {
+       (
+               unset CC LD CXX CCLD
+               oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs
+       )
+       oe_runmake
+}
+
+
 do_stage () {
-       oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+       oe_runmake install \
+               DESTDIR="" \
+               prefix=${STAGING_DIR} \
+               bindir=${STAGING_BINDIR} \
+               includedir=${STAGING_INCDIR} \
+               libdir=${STAGING_LIBDIR} \
+               mandir=${STAGING_DATADIR}/man
 }