summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-08-01 12:34:04 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-08-01 12:34:04 +0000
commita40e1ffd56734781d99abcf1fb3f09940e3bfb8e (patch)
treee8638ca5e23177367f5ea2f22942aef5a058f799 /meta/packages
parentd16d32c8a8577b1287a6fc4056b39b44bab93c8c (diff)
downloadpoky-a40e1ffd56734781d99abcf1fb3f09940e3bfb8e.tar.gz
libx11: do not remove X11/Xlib.h from staging
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2270 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/xorg-lib/libx11_1.1.1.bb3
-rw-r--r--meta/packages/xorg-lib/libx11_git.bb4
2 files changed, 2 insertions, 5 deletions
diff --git a/meta/packages/xorg-lib/libx11_1.1.1.bb b/meta/packages/xorg-lib/libx11_1.1.1.bb
index 3bd760e796..b2f8b5c780 100644
--- a/meta/packages/xorg-lib/libx11_1.1.1.bb
+++ b/meta/packages/xorg-lib/libx11_1.1.1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Base X libs."
4DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ 4DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
5 libxdmcp xf86bigfontproto kbproto inputproto" 5 libxdmcp xf86bigfontproto kbproto inputproto"
6PROVIDES = "virtual/libx11" 6PROVIDES = "virtual/libx11"
7PR = "r1" 7PR = "r2"
8PE = "1" 8PE = "1"
9 9
10XORG_PN = "libX11" 10XORG_PN = "libX11"
@@ -16,7 +16,6 @@ do_compile() {
16 unset CC LD CXX CCLD 16 unset CC LD CXX CCLD
17 oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys 17 oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
18 ) 18 )
19 rm -f ${STAGING_INCDIR}/X11/Xlib.h
20 oe_runmake 19 oe_runmake
21} 20}
22 21
diff --git a/meta/packages/xorg-lib/libx11_git.bb b/meta/packages/xorg-lib/libx11_git.bb
index 3f7fd5853e..f2929624e8 100644
--- a/meta/packages/xorg-lib/libx11_git.bb
+++ b/meta/packages/xorg-lib/libx11_git.bb
@@ -2,12 +2,11 @@ DEFAULT_PREFERENCE = "-1"
2 2
3DESCRIPTION = "Xlib/XCB: Xlib with XCB transport" 3DESCRIPTION = "Xlib/XCB: Xlib with XCB transport"
4SECTION = "x11/libs" 4SECTION = "x11/libs"
5PRIORITY = "optional"
6LICENSE = "XFree86" 5LICENSE = "XFree86"
7
8DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" 6DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
9PROVIDES = "virtual/libx11" 7PROVIDES = "virtual/libx11"
10RPROVIDES = "virtual/libx11" 8RPROVIDES = "virtual/libx11"
9PR = "r1"
11 10
12FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" 11FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
13FILES_${PN}-locale += "${datadir}/X11/locale" 12FILES_${PN}-locale += "${datadir}/X11/locale"
@@ -24,7 +23,6 @@ do_compile() {
24 unset CC LD CXX CCLD 23 unset CC LD CXX CCLD
25 oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys 24 oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
26 ) 25 )
27 rm -f ${STAGING_INCDIR}/X11/Xlib.h
28 oe_runmake 26 oe_runmake
29} 27}
30 28