diff options
Diffstat (limited to 'meta/packages')
-rw-r--r-- | meta/packages/xorg-lib/libx11_1.1.1.bb | 3 | ||||
-rw-r--r-- | meta/packages/xorg-lib/libx11_git.bb | 4 |
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." | |||
4 | DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ | 4 | DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ |
5 | libxdmcp xf86bigfontproto kbproto inputproto" | 5 | libxdmcp xf86bigfontproto kbproto inputproto" |
6 | PROVIDES = "virtual/libx11" | 6 | PROVIDES = "virtual/libx11" |
7 | PR = "r1" | 7 | PR = "r2" |
8 | PE = "1" | 8 | PE = "1" |
9 | 9 | ||
10 | XORG_PN = "libX11" | 10 | XORG_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 | ||
3 | DESCRIPTION = "Xlib/XCB: Xlib with XCB transport" | 3 | DESCRIPTION = "Xlib/XCB: Xlib with XCB transport" |
4 | SECTION = "x11/libs" | 4 | SECTION = "x11/libs" |
5 | PRIORITY = "optional" | ||
6 | LICENSE = "XFree86" | 5 | LICENSE = "XFree86" |
7 | |||
8 | DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" | 6 | DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" |
9 | PROVIDES = "virtual/libx11" | 7 | PROVIDES = "virtual/libx11" |
10 | RPROVIDES = "virtual/libx11" | 8 | RPROVIDES = "virtual/libx11" |
9 | PR = "r1" | ||
11 | 10 | ||
12 | FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" | 11 | FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" |
13 | FILES_${PN}-locale += "${datadir}/X11/locale" | 12 | FILES_${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 | ||