summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2010-12-31 11:07:52 +0800
committerSaul Wold <sgw@linux.intel.com>2011-01-02 01:25:41 -0800
commitd02e19ac91643fe63900d2c48e52d4585fe13432 (patch)
tree77a0442392cdca11e6d23859f1fe7b299d073769
parent5a859fcadc738b16132a4735f2a27a67473c3c9e (diff)
downloadpoky-d02e19ac91643fe63900d2c48e52d4585fe13432.tar.gz
lzo: upgrade to version 2.04
from 2.03 lzo: fix LIC_FILES_CHKSUM Signed-off-by: Qing He <qing.he@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-support/lzo/lzo-2.03/autofoo.patch17
-rw-r--r--meta/recipes-support/lzo/lzo-2.04/acinclude.m4 (renamed from meta/recipes-support/lzo/lzo-2.03/acinclude.m4)0
-rw-r--r--meta/recipes-support/lzo/lzo-2.04/autoconf.patch19
-rw-r--r--meta/recipes-support/lzo/lzo_2.04.bb (renamed from meta/recipes-support/lzo/lzo_2.03.bb)11
4 files changed, 25 insertions, 22 deletions
diff --git a/meta/recipes-support/lzo/lzo-2.03/autofoo.patch b/meta/recipes-support/lzo/lzo-2.03/autofoo.patch
deleted file mode 100644
index 5762f4c6e2..0000000000
--- a/meta/recipes-support/lzo/lzo-2.03/autofoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1---
2 configure.ac | 2 +-
3 1 file changed, 1 insertion(+), 1 deletion(-)
4
5Index: lzo-2.02/configure.ac
6===================================================================
7--- lzo-2.02.orig/configure.ac 2007-08-08 15:28:14.000000000 +0100
8+++ lzo-2.02/configure.ac 2007-08-08 15:28:21.000000000 +0100
9@@ -47,7 +47,7 @@ AC_CANONICAL_TARGET
10 AM_MAINTAINER_MODE
11
12 if test -z "$ac_abs_top_srcdir"; then
13- _AC_SRCPATHS(.)
14+ _AC_SRCDIRS(.)
15 fi
16 if test -r .Conf.settings1; then
17 . ./.Conf.settings1
diff --git a/meta/recipes-support/lzo/lzo-2.03/acinclude.m4 b/meta/recipes-support/lzo/lzo-2.04/acinclude.m4
index c4d2ccd5b5..c4d2ccd5b5 100644
--- a/meta/recipes-support/lzo/lzo-2.03/acinclude.m4
+++ b/meta/recipes-support/lzo/lzo-2.04/acinclude.m4
diff --git a/meta/recipes-support/lzo/lzo-2.04/autoconf.patch b/meta/recipes-support/lzo/lzo-2.04/autoconf.patch
new file mode 100644
index 0000000000..c342387107
--- /dev/null
+++ b/meta/recipes-support/lzo/lzo-2.04/autoconf.patch
@@ -0,0 +1,19 @@
1Date: 12/31/2010
2Didn't find 2.67 specific features, so lower the requirement
3to pass build
4
5Signed-off-by: Qing He <qing.he@intel.com>
6---
7diff --git a/configure.ac b/configure.ac
8index 650749a..2a78845 100644
9--- a/configure.ac
10+++ b/configure.ac
11@@ -36,7 +36,7 @@ All Rights Reserved.
12 This configure script may be copied, distributed and modified under the
13 terms of the GNU General Public License; see COPYING for more details.])
14
15-AC_PREREQ(2.67)
16+AC_PREREQ(2.65)
17 AC_INIT([LZO],[2.04],[markus@oberhumer.com],[lzo],[http://www.oberhumer.com/opensource/lzo/])
18 AC_MSG_NOTICE([Configuring LZO $PACKAGE_VERSION])
19 AC_CONFIG_SRCDIR(src/lzo_init.c)
diff --git a/meta/recipes-support/lzo/lzo_2.03.bb b/meta/recipes-support/lzo/lzo_2.04.bb
index 05b10ee9f7..f8c8aba3a3 100644
--- a/meta/recipes-support/lzo/lzo_2.03.bb
+++ b/meta/recipes-support/lzo/lzo_2.04.bb
@@ -4,15 +4,16 @@ SECTION = "libs"
4PRIORITY = "optional" 4PRIORITY = "optional"
5LICENSE = "GPLv2+" 5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=8cad52263e636e25377bc18420118101 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=8cad52263e636e25377bc18420118101 \
7 file://src/lzo_init.c;beginline=5;endline=33;md5=094776237523b2e93124cf09b9c76aef" 7 file://src/lzo_init.c;beginline=5;endline=36;md5=454f781644dfe945e3634a9b699e91f3"
8PR = "r0" 8PR = "r0"
9 9
10SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \ 10SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \
11 file://autofoo.patch \ 11 file://autoconf.patch \
12 file://acinclude.m4" 12 file://acinclude.m4 \
13 "
13 14
14SRC_URI[md5sum] = "0c3d078c2e8ea5a88971089a2f02a726" 15SRC_URI[md5sum] = "a383c7055a310e2a71b9ecd19cfea238"
15SRC_URI[sha256sum] = "8b1b0da8f757b9ac318e1c15a0eac8bdb56ca902a2dd25beda06c0f265f22591" 16SRC_URI[sha256sum] = "4ee3a040facf39561f13e4ef2ab99a886fd68251a35d612486ed0625cc6ab428"
16 17
17inherit autotools 18inherit autotools
18 19