From a16b6b8658cf511a7e271ca70ed5a6f6a78d1133 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 18 May 2015 17:45:29 +0100 Subject: libxt: upgrade to 1.1.5 Remove the custom compile logic as upstream now detects cross-compilation and uses CC_FOR_BUILD. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-lib/libxt_1.1.4.bb | 44 --------------------------- meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb | 33 ++++++++++++++++++++ 2 files changed, 33 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libxt_1.1.4.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libxt_1.1.4.bb deleted file mode 100644 index 9c1aaa4370..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxt_1.1.4.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Xt: X Toolkit Intrinsics library" - -DESCRIPTION = "The Intrinsics are a programming library tailored to the \ -special requirements of user interface construction within a network \ -window system, specifically the X Window System. The Intrinsics and a \ -widget set make up an X Toolkit. The Intrinsics provide the base \ -mechanism necessary to build a wide variety of interoperating widget \ -sets and application environments. The Intrinsics are a layer on top of \ -Xlib, the C Library X Interface. They extend the fundamental \ -abstractions provided by the X Window System while still remaining \ -independent of any particular user interface policy or style." - -require xorg-lib-common.inc - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=6565b1e0094ea1caae0971cc4035f343" - - -DEPENDS += "util-linux libxcb libsm virtual/libx11 kbproto libxdmcp" -PROVIDES = "xt" - -PE = "1" - -XORG_PN = "libXt" - -SRC_URI += "file://libxt_fix_for_x32.patch" - -BBCLASSEXTEND = "native" - -EXTRA_OECONF += "--disable-xkb" - -do_compile() { - ( - unset CC LD CXX CCLD CFLAGS - oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE -I${STAGING_INCDIR_NATIVE} ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs - ) - if [ "$?" != "0" ]; then - exit 1 - fi - oe_runmake -} - -SRC_URI[md5sum] = "03149823ae57bb02d0cec90d5b97d56c" -SRC_URI[sha256sum] = "843a97a988f5654872682a4120486d987d853a71651515472f55519ffae2dd57" diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb b/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb new file mode 100644 index 0000000000..c1ed0bb314 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb @@ -0,0 +1,33 @@ +SUMMARY = "Xt: X Toolkit Intrinsics library" + +DESCRIPTION = "The Intrinsics are a programming library tailored to the \ +special requirements of user interface construction within a network \ +window system, specifically the X Window System. The Intrinsics and a \ +widget set make up an X Toolkit. The Intrinsics provide the base \ +mechanism necessary to build a wide variety of interoperating widget \ +sets and application environments. The Intrinsics are a layer on top of \ +Xlib, the C Library X Interface. They extend the fundamental \ +abstractions provided by the X Window System while still remaining \ +independent of any particular user interface policy or style." + +require xorg-lib-common.inc + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=6565b1e0094ea1caae0971cc4035f343" + + +DEPENDS += "util-linux libxcb libsm virtual/libx11 kbproto libxdmcp" +PROVIDES = "xt" + +PE = "1" + +XORG_PN = "libXt" + +SRC_URI += "file://libxt_fix_for_x32.patch" + +BBCLASSEXTEND = "native" + +EXTRA_OECONF += "--disable-xkb" + +SRC_URI[md5sum] = "8f5b5576fbabba29a05f3ca2226f74d3" +SRC_URI[sha256sum] = "46eeb6be780211fdd98c5109286618f6707712235fdd19df4ce1e6954f349f1a" -- cgit v1.2.3