summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-12-02 03:27:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-02 15:28:42 (GMT)
commit94d49c2c99c41692b2e4c29f8d991d74ffea8c8b (patch)
treeb09444f1d67b1b0b2bd1425a4ab16bdcac593beb
parent7b31027b08daff4cf7be5750722d85173c52d963 (diff)
downloadpoky-94d49c2c99c41692b2e4c29f8d991d74ffea8c8b.tar.gz
lzo: remove the uncessary autoconf.patch
Now we already have autoconf-2.68 that is newer than 2.67 that is required by lzo. So the patch is not needed any longer. Thanks Khem Raj for pointing this out! (From OE-Core rev: 703518b501e9b82ee340696bfcce5685c9609ffb) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/lzo/lzo-2.06/autoconf.patch28
-rw-r--r--meta/recipes-support/lzo/lzo_2.06.bb3
2 files changed, 1 insertions, 30 deletions
diff --git a/meta/recipes-support/lzo/lzo-2.06/autoconf.patch b/meta/recipes-support/lzo/lzo-2.06/autoconf.patch
deleted file mode 100644
index 63c1d2d..0000000
--- a/meta/recipes-support/lzo/lzo-2.06/autoconf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Date: 12/31/2010
2Didn't find 2.67 specific features, so lower the requirement
3to pass build
4
5Upstream-Status: Inappropriate [workaround]
6
7Signed-off-by: Qing He <qing.he@intel.com>
8
9
10
11Wed Nov 30 14:42:01 CST 2011
12Rebase to lzo-2.06.
13Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
14
15---
16diff --git a/configure.ac b/configure.ac
17index 650749a..2a78845 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -36,7 +36,7 @@ All Rights Reserved.
21 This configure script may be copied, distributed and modified under the
22 terms of the GNU General Public License; see COPYING for more details.])
23
24-AC_PREREQ(2.67)
25+AC_PREREQ(2.65)
26 AC_INIT([LZO],[2.06],[markus@oberhumer.com],[lzo],[http://www.oberhumer.com/opensource/lzo/])
27 AC_MSG_NOTICE([Configuring LZO $PACKAGE_VERSION])
28 AC_CONFIG_SRCDIR(src/lzo_init.c)
diff --git a/meta/recipes-support/lzo/lzo_2.06.bb b/meta/recipes-support/lzo/lzo_2.06.bb
index b2cc171..4862082 100644
--- a/meta/recipes-support/lzo/lzo_2.06.bb
+++ b/meta/recipes-support/lzo/lzo_2.06.bb
@@ -4,10 +4,9 @@ SECTION = "libs"
4LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
6 file://src/lzo_init.c;beginline=23;endline=40;md5=924a0f71f5394f6d404be3b458474769" 6 file://src/lzo_init.c;beginline=23;endline=40;md5=924a0f71f5394f6d404be3b458474769"
7PR = "r0" 7PR = "r1"
8 8
9SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \ 9SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \
10 file://autoconf.patch \
11 file://acinclude.m4 \ 10 file://acinclude.m4 \
12 " 11 "
13 12