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

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."
 DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
             libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
-PR = "r1"
+PR = "r2"
 PE = "1"
 
 XORG_PN = "libX11"
@@ -16,7 +16,6 @@ do_compile() {
                 unset CC LD CXX CCLD
                 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
         )
-        rm -f ${STAGING_INCDIR}/X11/Xlib.h
         oe_runmake
 }
 
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"
 
 DESCRIPTION = "Xlib/XCB: Xlib with XCB transport"
 SECTION = "x11/libs"
-PRIORITY = "optional"
 LICENSE = "XFree86"
-
 DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
 PROVIDES = "virtual/libx11"
 RPROVIDES = "virtual/libx11"
+PR = "r1"
 
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
 FILES_${PN}-locale += "${datadir}/X11/locale"
@@ -24,7 +23,6 @@ do_compile() {
                 unset CC LD CXX CCLD
                 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
         )
-        rm -f ${STAGING_INCDIR}/X11/Xlib.h
         oe_runmake
 }