summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFan Xin <fan.xin@jp.fujitsu.com>2017-06-02 13:49:05 +0900
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-06 19:52:26 +0100
commitfff42bb44faf03fcb8e69d9a1c5809af81493fbc (patch)
tree6b2b09be40b8602d1b5d4c26a3df0a6cfc8cda6d
parent591b6623ebcb66bafa775fbdfb090b1e9a6b517f (diff)
downloadpoky-fff42bb44faf03fcb8e69d9a1c5809af81493fbc.tar.gz
lzo: Upgrade 2.09 -> 2.10
1. Upgrade lzo from 2.09 to 2.10 2. Update the license checksum due to the date change, not license change. 3. Add a patch to fix the undefined error. (From OE-Core rev: 874cf9e9ec72eb7235ef1997fdfea9c33b3628f6) Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/lzo/lzo/0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch27
-rw-r--r--meta/recipes-support/lzo/lzo_2.10.bb (renamed from meta/recipes-support/lzo/lzo_2.09.bb)7
2 files changed, 31 insertions, 3 deletions
diff --git a/meta/recipes-support/lzo/lzo/0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch b/meta/recipes-support/lzo/lzo/0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch
new file mode 100644
index 0000000000..5235a15dc9
--- /dev/null
+++ b/meta/recipes-support/lzo/lzo/0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch
@@ -0,0 +1,27 @@
1From e730bfd7c2d3a4b5f3605878599cb9b20d31b1fd Mon Sep 17 00:00:00 2001
2From: Fan Xin <fan.xin@jp.fujitsu.com>
3Date: Fri, 2 Jun 2017 11:52:25 +0900
4Subject: [PATCH] Add pkgconfigdir to solve the undefine error.
5
6Upstream-Status: Pending
7
8Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
9---
10 Makefile.am | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/Makefile.am b/Makefile.am
14index e4d383b..c75023d 100644
15--- a/Makefile.am
16+++ b/Makefile.am
17@@ -14,6 +14,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)
18 LDADD = src/liblzo2.la
19 lib_LTLIBRARIES =
20 noinst_PROGRAMS =
21+pkgconfigdir = $(libdir)/pkgconfig
22 pkgconfig_DATA = lzo2.pc
23
24
25--
261.9.1
27
diff --git a/meta/recipes-support/lzo/lzo_2.09.bb b/meta/recipes-support/lzo/lzo_2.10.bb
index 2978617bbd..490d2307ac 100644
--- a/meta/recipes-support/lzo/lzo_2.09.bb
+++ b/meta/recipes-support/lzo/lzo_2.10.bb
@@ -3,16 +3,17 @@ HOMEPAGE = "http://www.oberhumer.com/opensource/lzo/"
3SECTION = "libs" 3SECTION = "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=5;endline=25;md5=355023835a9b9eeb70ab895395e951ff" 6 file://src/lzo_init.c;beginline=5;endline=25;md5=9ae697ca01829b0a383c5d2d163e0108"
7 7
8SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \ 8SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \
9 file://0001-Use-memcpy-instead-of-reinventing-it.patch \ 9 file://0001-Use-memcpy-instead-of-reinventing-it.patch \
10 file://0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch \
10 file://acinclude.m4 \ 11 file://acinclude.m4 \
11 file://run-ptest \ 12 file://run-ptest \
12 " 13 "
13 14
14SRC_URI[md5sum] = "c7ffc9a103afe2d1bba0b015e7aa887f" 15SRC_URI[md5sum] = "39d3f3f9c55c87b1e5d6888e1420f4b5"
15SRC_URI[sha256sum] = "f294a7ced313063c057c504257f437c8335c41bfeed23531ee4e6a2b87bcb34c" 16SRC_URI[sha256sum] = "c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072"
16 17
17inherit autotools ptest 18inherit autotools ptest
18 19