[oe-commits] org.oe.dev libxml2: Provide common include

[thebohemian commit]

libxml2: Provide common include
 - added 2.6.27 recipe (for Maemo)
 - changed 2.6.29 recipe to use the include
chinook-compat.conf:
 - fixed version preference for libxml2

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: f00585816c3caa386e981ceb5580dc29a81b448f
ViewMTN: http://monotone.openembedded.org/revision/info/f00585816c3caa386e981ceb5580dc29a81b448f
Files:
1
packages/libxml/libxml2.inc
packages/libxml/libxml2_2.6.27.bb
conf/distro/chinook-compat.conf
packages/libxml/libxml2_2.6.29.bb
Diffs:

#
# mt diff -r0990463407497f3ccfd16f2ea5f4cbb83e0400ac -rf00585816c3caa386e981ceb5580dc29a81b448f
#
# 
# 
# add_file "packages/libxml/libxml2.inc"
#  content [706c18782e65cf5724e89f7d9ecfaeca86820455]
# 
# add_file "packages/libxml/libxml2_2.6.27.bb"
#  content [aa08947f435a2f78fca5ee2d8a07fcd4a34c91f6]
# 
# patch "conf/distro/chinook-compat.conf"
#  from [3181de24687008b12f03ae42dc449804df8f79a4]
#    to [71a18c9555e92f4daa94631ec75895dff4657653]
# 
# patch "packages/libxml/libxml2_2.6.29.bb"
#  from [74558b89eaffb7fdd847368d871f463438a97864]
#    to [091dcc2c8f89038636039f70dc06dc0a82d93979]
# 
============================================================
--- packages/libxml/libxml2.inc	706c18782e65cf5724e89f7d9ecfaeca86820455
+++ packages/libxml/libxml2.inc	706c18782e65cf5724e89f7d9ecfaeca86820455
@@ -0,0 +1,29 @@
+DESCRIPTION = "GNOME XML Parser library"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "MIT"
+
+SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
+
+inherit autotools pkgconfig binconfig
+
+EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
+
+export LDFLAGS += "-ldl"
+
+do_stage() {
+	autotools_stage_all
+	install -d ${STAGING_DATADIR}/aclocal/
+	install -d ${STAGING_BINDIR_CROSS}
+
+ 	install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
+	#this is need it by php during its install
+	install -m 0755 xml2-config ${STAGING_BINDIR_CROSS}
+}
+
+DEBIANNAME_${PN} = "libxml2"
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/*-config"
+FILES_${PN}-utils += "${bindir}/*"
============================================================
--- packages/libxml/libxml2_2.6.27.bb	aa08947f435a2f78fca5ee2d8a07fcd4a34c91f6
+++ packages/libxml/libxml2_2.6.27.bb	aa08947f435a2f78fca5ee2d8a07fcd4a34c91f6
@@ -0,0 +1,3 @@
+# You want this old version for compatibility with Maemo OS2008.
+require libxml2.inc
+
============================================================
--- conf/distro/chinook-compat.conf	3181de24687008b12f03ae42dc449804df8f79a4
+++ conf/distro/chinook-compat.conf	71a18c9555e92f4daa94631ec75895dff4657653
@@ -87,8 +87,7 @@ PREFERRED_VERSION_gtkhtml-3.8      = "3.
 PREFERRED_VERSION_gnome-vfs        = "2.16"
 # 3.9.1 would be correct
 PREFERRED_VERSION_gtkhtml-3.8      = "3.8.2"
-# 2.6.27 would be correct
-PREFERRED_VERSION_libxml           = "2.6.29"
+PREFERRED_VERSION_libxml2          = "2.6.27"
 # 2.16 would be correct
 PREFERRED_VERSION_gconf            = "2.6.1"
 
============================================================
--- packages/libxml/libxml2_2.6.29.bb	74558b89eaffb7fdd847368d871f463438a97864
+++ packages/libxml/libxml2_2.6.29.bb	091dcc2c8f89038636039f70dc06dc0a82d93979
@@ -1,30 +1,4 @@
-DESCRIPTION = "GNOME XML Parser library"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "MIT"
-PR = "r5"
+require libxml2.inc
 
-SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
+PR = "r5"
 
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
-
-export LDFLAGS += "-ldl"
-
-do_stage() {
-	autotools_stage_all
-	install -d ${STAGING_DATADIR}/aclocal/
-	install -d ${STAGING_BINDIR_CROSS}
-
- 	install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
-	#this is need it by php during its install
-	install -m 0755 xml2-config ${STAGING_BINDIR_CROSS}
-}
-
-DEBIANNAME_${PN} = "libxml2"
-
-PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dev += "${bindir}/*-config"
-FILES_${PN}-utils += "${bindir}/*"