summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-04-05 22:26:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-06 22:57:25 +0100
commit45c19447ae611d4d1997dee83ea4dc00cd12b852 (patch)
tree2e7e22b7126308f8a80368d7b66ef20134a16957
parentcbe33ecb15f71737354184cd9f3b7507ab97b2e4 (diff)
downloadpoky-45c19447ae611d4d1997dee83ea4dc00cd12b852.tar.gz
bzip2: set correct soname
The correct name for the bzip2 shared library is libbz2.so.1.0.6, not libbz2.so.0.0.0. Pass -version-info to libtool to correct this. Also fix the configure.ac so that is doesn't mention libXrender and has the right version. (From OE-Core rev: 1ae11a6ea5ff82f6492a880ff45e19f3779918da) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am1
-rw-r--r--meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac5
2 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am b/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am
index 1d163b6c98..05d389fc7d 100644
--- a/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am
+++ b/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am
@@ -1,5 +1,6 @@
1 1
2lib_LTLIBRARIES = libbz2.la 2lib_LTLIBRARIES = libbz2.la
3libbz2_la_LDFLAGS = -version-info 1:6:0
3 4
4libbz2_la_SOURCES = blocksort.c \ 5libbz2_la_SOURCES = blocksort.c \
5 huffman.c \ 6 huffman.c \
diff --git a/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac b/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac
index 47ee576a8e..e2bf1bf110 100644
--- a/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac
+++ b/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac
@@ -1,12 +1,9 @@
1AC_PREREQ([2.57]) 1AC_PREREQ([2.57])
2 2
3AC_INIT(bzip2, 2.0.5, , libXrender) 3AC_INIT(bzip2, 1.0.6)
4AM_INIT_AUTOMAKE(foreign) 4AM_INIT_AUTOMAKE(foreign)
5AM_MAINTAINER_MODE 5AM_MAINTAINER_MODE
6 6
7#AM_CONFIG_HEADER(config.h)
8
9# Check for progs
10AC_PROG_CC 7AC_PROG_CC
11AC_PROG_LIBTOOL 8AC_PROG_LIBTOOL
12 9