summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2004-06-27 11:45:14 +0000
committerPhil Blundell <philb@gnu.org>2004-06-27 11:45:14 +0000
commitb6bb22fd0891a5ca0689ab18d2a4f091a9b884ac (patch)
tree64d51ed094cbacc2b91449493ae64c8ccb40cfb1 /x11
parent7c95646854c996d9715a91257a12d0ef3c754822 (diff)
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
Diffstat (limited to 'x11')
-rw-r--r--x11/x11_6.2.1.oe35
-rw-r--r--x11/x11_cvs.oe1
2 files changed, 36 insertions, 0 deletions
diff --git a/x11/x11_6.2.1.oe b/x11/x11_6.2.1.oe
index e69de29bb2..3825ae6001 100644
--- 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 b5aa4c03a3..8e5973f98d 100644
--- 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"