aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/libxml
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2012-01-02 16:05:16 -0600
committerSaul Wold <sgw@linux.intel.com>2012-01-09 21:51:50 -0800
commitd1f1fec5c6fe980aaf2c1f1dc2a0e737f4adf2dd (patch)
tree6f985c7d459233782da23aeab16499bd3f031c11 /meta/recipes-core/libxml
parent289d09176f8b6f66f6a7807b57f10e86939942f5 (diff)
downloadopenembedded-core-contrib-d1f1fec5c6fe980aaf2c1f1dc2a0e737f4adf2dd.tar.gz
openembedded-core-contrib-d1f1fec5c6fe980aaf2c1f1dc2a0e737f4adf2dd.tar.bz2
openembedded-core-contrib-d1f1fec5c6fe980aaf2c1f1dc2a0e737f4adf2dd.zip
libxml2: add shared library version info to libxml shared libraries
This fixes an issue with RPM where it checks version imformation for binaries linked against libxml and fails because it's missing info | error: Failed dependencies: | libxml2.so.2(LIBXML2_2.6.0) is needed by fmc-0.9.7+2-r2.1.ppce500mc | libxml2.so.2(LIBXML2_2.4.30) is needed by fmc-0.9.7+2-r2.1.ppce500mc | ERROR: Function 'do_rootfs' failed (see Note: fmc is just an example recipe/name Signed-off-by: Matthew McClintock <msm@freescale.com>
Diffstat (limited to 'meta/recipes-core/libxml')
-rw-r--r--meta/recipes-core/libxml/libxml2/fix_version_info.patch23
-rw-r--r--meta/recipes-core/libxml/libxml2_2.7.8.bb4
2 files changed, 26 insertions, 1 deletions
diff --git a/meta/recipes-core/libxml/libxml2/fix_version_info.patch b/meta/recipes-core/libxml/libxml2/fix_version_info.patch
new file mode 100644
index 00000000000..77113ef454e
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/fix_version_info.patch
@@ -0,0 +1,23 @@
+Upstream-Status: Already upstream
+
+From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Thu, 04 Nov 2010 20:53:14 +0000
+Subject: Reactivate the shared library versionning script
+
+---
+diff --git a/configure.in b/configure.in
+index 59d0629..a1d2c89 100644
+--- a/configure.in
++++ b/configure.in
+@@ -84,7 +84,7 @@ else
+ esac
+ fi
+ AC_SUBST(VERSION_SCRIPT_FLAGS)
+-AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"])
++AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
+
+ dnl
+ dnl We process the AC_ARG_WITH first so that later we can modify
+--
+cgit v0.9.0.2
diff --git a/meta/recipes-core/libxml/libxml2_2.7.8.bb b/meta/recipes-core/libxml/libxml2_2.7.8.bb
index 2fa246e1829..0b6ce02b006 100644
--- a/meta/recipes-core/libxml/libxml2_2.7.8.bb
+++ b/meta/recipes-core/libxml/libxml2_2.7.8.bb
@@ -1,6 +1,8 @@
require libxml2.inc
-PR = "r4"
+PR = "r5"
+
+SRC_URI += "file://fix_version_info.patch"
SRC_URI[md5sum] = "8127a65e8c3b08856093099b52599c86"
SRC_URI[sha256sum] = "cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec"