mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
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
This commit is contained in:
@@ -4,7 +4,7 @@ DESCRIPTION = "Base X libs."
|
|||||||
DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
|
DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
|
||||||
libxdmcp xf86bigfontproto kbproto inputproto"
|
libxdmcp xf86bigfontproto kbproto inputproto"
|
||||||
PROVIDES = "virtual/libx11"
|
PROVIDES = "virtual/libx11"
|
||||||
PR = "r1"
|
PR = "r2"
|
||||||
PE = "1"
|
PE = "1"
|
||||||
|
|
||||||
XORG_PN = "libX11"
|
XORG_PN = "libX11"
|
||||||
@@ -16,7 +16,6 @@ do_compile() {
|
|||||||
unset CC LD CXX CCLD
|
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
|
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
|
oe_runmake
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,12 +2,11 @@ DEFAULT_PREFERENCE = "-1"
|
|||||||
|
|
||||||
DESCRIPTION = "Xlib/XCB: Xlib with XCB transport"
|
DESCRIPTION = "Xlib/XCB: Xlib with XCB transport"
|
||||||
SECTION = "x11/libs"
|
SECTION = "x11/libs"
|
||||||
PRIORITY = "optional"
|
|
||||||
LICENSE = "XFree86"
|
LICENSE = "XFree86"
|
||||||
|
|
||||||
DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
|
DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
|
||||||
PROVIDES = "virtual/libx11"
|
PROVIDES = "virtual/libx11"
|
||||||
RPROVIDES = "virtual/libx11"
|
RPROVIDES = "virtual/libx11"
|
||||||
|
PR = "r1"
|
||||||
|
|
||||||
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
|
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
|
||||||
FILES_${PN}-locale += "${datadir}/X11/locale"
|
FILES_${PN}-locale += "${datadir}/X11/locale"
|
||||||
@@ -24,7 +23,6 @@ do_compile() {
|
|||||||
unset CC LD CXX CCLD
|
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
|
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
|
oe_runmake
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user