Merge bk://openembedded@openembedded.bkbits.net/packages

into stealth.(none):/home/pb/oe/oe-packages

2004/06/27 12:45:00+01:00 (none)!pb
reinstate PROVIDES="x11"

BKrev: 40deb34aT7s-QqjqUwJBBPX1b1ZWNg

diff --git a/x11/x11_6.2.1.oe b/x11/x11_6.2.1.oe
index e69de29..3825ae6 100644 (file)
--- a/x11/x11_6.2.1.oe
+++ b/x11/x11_6.2.1.oe
@@ -0,0 +1,35 @@
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto xextensions xau xtrans xdmcp"
+DESCRIPTION = "Base X libs."
+FILES_${PN}_append = " ${datadir}/X11"
+PROVIDES = "x11"
+
+SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2"
+S = "${WORKDIR}/libX11-${PV}"
+
+inherit autotools pkgconfig 
+
+do_compile() {
+       (
+               unset CC LD CXX CCLD
+#              unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+               oe_runmake -C src/util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys
+       )
+       oe_runmake
+}
+
+do_stage() {
+       install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h
+       install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h
+       install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h
+       install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h
+       install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h
+       install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h
+       install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h
+       install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h
+       install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h
+
+       oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR}
+}

diff --git a/x11/x11_cvs.oe b/x11/x11_cvs.oe
index b5aa4c0..8e5973f 100644 (file)
--- a/x11/x11_cvs.oe
+++ b/x11/x11_cvs.oe
@@ -5,6 +5,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto xextensions xau xtrans xdmcp"
 DESCRIPTION = "Base X libs."
 FILES_${PN}_append = " ${datadir}/X11"
+PROVIDES = "x11"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11"
 S = "${WORKDIR}/X11"