[oe-commits] org.oe.dev merge of '2a763ba11cf69b342a356812987f63bb2053011b'

[koen commit]

merge of '2a763ba11cf69b342a356812987f63bb2053011b'
     and '4ca56810304293da744170c82e50552f5dcf084f'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 6d97c31f3f11e588adb33963b16bfcca4848ac70
ViewMTN: http://monotone.openembedded.org/revision/info/6d97c31f3f11e588adb33963b16bfcca4848ac70
Files:
1
packages/xorg-lib/libx11-native_1.0.3.bb
Diffs:

#
# mt diff -r2a763ba11cf69b342a356812987f63bb2053011b -r6d97c31f3f11e588adb33963b16bfcca4848ac70
#
# 
# no changes
# 


#
# mt diff -r4ca56810304293da744170c82e50552f5dcf084f -r6d97c31f3f11e588adb33963b16bfcca4848ac70
#
# 
# 
# add_file "packages/xorg-lib/libx11-native_1.0.3.bb"
#  content [cdad9b5aab7c4683bfe87d0933aa450930c75451]
# 
============================================================
--- packages/xorg-lib/libx11-native_1.0.3.bb	cdad9b5aab7c4683bfe87d0933aa450930c75451
+++ packages/xorg-lib/libx11-native_1.0.3.bb	cdad9b5aab7c4683bfe87d0933aa450930c75451
@@ -0,0 +1,28 @@
+DESCRIPTION = "Base X libs."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+PE = "1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
+PROVIDES = "x11-native"
+
+XORG_PN = "libX11"
+
+SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2"
+S = "${WORKDIR}/libX11-${PV}"
+
+inherit native autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+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
+}