summaryrefslogtreecommitdiff
path: root/packages/x11
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-02-28 03:14:31 +0000
committerRod Whitby <rod@whitby.id.au>2005-02-28 03:14:31 +0000
commite881c5c94a2243f02b9bfaefa24151a06067afb1 (patch)
treeb3a19c9e6109fdf596d9dc7c54d6e3f4d070c6f3 /packages/x11
parented4e78c4103fbc0035560aa8ffa5cd83915eb862 (diff)
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/slug/openembedded 2005/02/27 03:40:13-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/28 03:14:29+00:00 (none)!pb update gstreamer to 0.8.9; turn off libxml2 dependency 2005/02/28 02:28:17+00:00 (none)!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mebius.(none):/home/pb/oe/oe 2005/02/26 14:36:31+00:00 (none)!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mebius.(none):/home/pb/oe/oe 2005/02/26 14:35:49+00:00 (none)!pb avoid problems with stale Xlib.h in staging area during libX11 build 2005/02/26 14:35:14+00:00 (none)!pb update rxvt-unicode to 5.2 2005/02/26 14:34:52+00:00 (none)!pb add new diet-x11 snapshot BKrev: 42228c979mympxJkH_N2vX7aKdOg-w
Diffstat (limited to 'packages/x11')
-rw-r--r--packages/x11/diet-x11_20050226.bb0
-rw-r--r--packages/x11/x11_cvs.bb1
2 files changed, 1 insertions, 0 deletions
diff --git a/packages/x11/diet-x11_20050226.bb b/packages/x11/diet-x11_20050226.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/x11/diet-x11_20050226.bb
diff --git a/packages/x11/x11_cvs.bb b/packages/x11/x11_cvs.bb
index de62076710..cc042d5e3f 100644
--- a/packages/x11/x11_cvs.bb
+++ b/packages/x11/x11_cvs.bb
@@ -21,6 +21,7 @@ do_compile() {
# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
oe_runmake -C src/util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys
)
+ rm -f ${STAGING_INCDIR}/X11/Xlib.h
oe_runmake
}