summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2012-01-02 22:05:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-10 17:28:45 (GMT)
commitac7a6e7bafbfcda2a4a0c86b8bb6dffdb376b2f7 (patch)
treeb23c2671ba32dd856aff41e0a37b803ac8197dc6
parent4b6df4f2668c6e85d8059e1896812a1a8db23786 (diff)
downloadpoky-ac7a6e7bafbfcda2a4a0c86b8bb6dffdb376b2f7.tar.gz
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 (From OE-Core rev: d1f1fec5c6fe980aaf2c1f1dc2a0e737f4adf2dd) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 0000000..77113ef
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/fix_version_info.patch
@@ -0,0 +1,23 @@
1Upstream-Status: Already upstream
2
3From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001
4From: Daniel Veillard <veillard@redhat.com>
5Date: Thu, 04 Nov 2010 20:53:14 +0000
6Subject: Reactivate the shared library versionning script
7
8---
9diff --git a/configure.in b/configure.in
10index 59d0629..a1d2c89 100644
11--- a/configure.in
12+++ b/configure.in
13@@ -84,7 +84,7 @@ else
14 esac
15 fi
16 AC_SUBST(VERSION_SCRIPT_FLAGS)
17-AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"])
18+AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
19
20 dnl
21 dnl We process the AC_ARG_WITH first so that later we can modify
22--
23cgit 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 2fa246e..0b6ce02 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 @@
1require libxml2.inc 1require libxml2.inc
2 2
3PR = "r4" 3PR = "r5"
4
5SRC_URI += "file://fix_version_info.patch"
4 6
5SRC_URI[md5sum] = "8127a65e8c3b08856093099b52599c86" 7SRC_URI[md5sum] = "8127a65e8c3b08856093099b52599c86"
6SRC_URI[sha256sum] = "cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec" 8SRC_URI[sha256sum] = "cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec"