[oe-commits] org.oe.dev merge of '0721559f76e0aaf9b2151c4ad47b5f5e77f92ea4'

[hrw commit]

merge of '0721559f76e0aaf9b2151c4ad47b5f5e77f92ea4'
     and '4ca56810304293da744170c82e50552f5dcf084f'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 46db3c709c5b3934153282a281ab3f4d09dbe19a
ViewMTN: http://monotone.openembedded.org/revision/info/46db3c709c5b3934153282a281ab3f4d09dbe19a
Files:
1
packages/xorg-lib/libx11-native_1.0.3.bb
packages/perl/libxml-parser-perl_2.34.bb
packages/tasks/task-native-sdk.bb
Diffs:

#
# mt diff -r0721559f76e0aaf9b2151c4ad47b5f5e77f92ea4 -r46db3c709c5b3934153282a281ab3f4d09dbe19a
#
# 
# no changes
# 


#
# mt diff -r4ca56810304293da744170c82e50552f5dcf084f -r46db3c709c5b3934153282a281ab3f4d09dbe19a
#
# 
# 
# add_file "packages/xorg-lib/libx11-native_1.0.3.bb"
#  content [cdad9b5aab7c4683bfe87d0933aa450930c75451]
# 
# patch "packages/perl/libxml-parser-perl_2.34.bb"
#  from [9fe85cf758444af63185e9cfaffa8e9c253451ce]
#    to [df4c8dc1823ab29c423c8b3de34f375a43450cb0]
# 
# patch "packages/tasks/task-native-sdk.bb"
#  from [7a8357c0638184a616c5933e9d5a31908b09a3e0]
#    to [e9aff3af03f3423a34dcb2853582e08fdd66a6a5]
# 
============================================================
--- 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
+}
============================================================
--- packages/perl/libxml-parser-perl_2.34.bb	9fe85cf758444af63185e9cfaffa8e9c253451ce
+++ packages/perl/libxml-parser-perl_2.34.bb	df4c8dc1823ab29c423c8b3de34f375a43450cb0
@@ -1,7 +1,7 @@ LICENSE = "Artistic"
 SECTION = "libs"
 LICENSE = "Artistic"
-DEPENDS += "expat-native"
-PR = "r10"
+DEPENDS += "expat expat-native"
+PR = "r11"
 
 SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"
 
============================================================
--- packages/tasks/task-native-sdk.bb	7a8357c0638184a616c5933e9d5a31908b09a3e0
+++ packages/tasks/task-native-sdk.bb	e9aff3af03f3423a34dcb2853582e08fdd66a6a5
@@ -1,10 +1,10 @@ RDEPENDS = "gcc-symlinks g++-symlinks bi
 DESCRIPTION = "Packages required for native (on-device) SDK"
 LICENSE = "MIT"
 DEPENDS = "gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep"
 RDEPENDS = "gcc-symlinks g++-symlinks binutils-symlinks make libc6-dev \
 	    flex flex-dev bison gawk sed grep autoconf automake make \
-	    patch patchutils diffstat diffutils libgcc-s-dev libstdc++-dev"
-PR = "r1"
+	    patch patchutils diffstat diffutils libstdc++-dev"
+PR = "r2"
 
 ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"