summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-07-15 12:04:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-16 13:53:16 +0100
commit63731c5d5fcc3d48527062a9ca953ac9f9e9b377 (patch)
tree344b01455c6bc6280998287f44216a68d56cbb3f
parentd46a59b21d2db9ad8b4962a9bab839db1179565e (diff)
downloadpoky-63731c5d5fcc3d48527062a9ca953ac9f9e9b377.tar.gz
tiff: remove redundant patch
The patching to make the new libtool work (from 2008) is no longer needed. (From OE-Core rev: 4210fafa851d011023f5a58ed3887148168f861c) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/libtiff/files/libtool2.patch24
-rw-r--r--meta/recipes-multimedia/libtiff/tiff_4.0.10.bb5
2 files changed, 1 insertions, 28 deletions
diff --git a/meta/recipes-multimedia/libtiff/files/libtool2.patch b/meta/recipes-multimedia/libtiff/files/libtool2.patch
deleted file mode 100644
index 96233b46c9..0000000000
--- a/meta/recipes-multimedia/libtiff/files/libtool2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 5b893206e0a0d529ba2d0caf58cfffc03bccb598 Mon Sep 17 00:00:00 2001
2From: Marcin Juszkiewicz <hrw@openedhand.com>
3Date: Sat, 14 Jun 2008 13:42:22 +0000
4Subject: [PATCH] tiff: make it work after libtool upgrade
5
6Upstream-Status: Inappropriate [configuration]
7
8---
9 configure.ac | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/configure.ac b/configure.ac
13index c7b02e2..ae1c964 100644
14--- a/configure.ac
15+++ b/configure.ac
16@@ -27,7 +27,7 @@ dnl Process this file with autoconf to produce a configure script.
17 AC_PREREQ(2.64)
18 AC_INIT([LibTIFF Software],[4.0.10],[tiff@lists.maptools.org],[tiff])
19 AC_CONFIG_AUX_DIR(config)
20-AC_CONFIG_MACRO_DIR(m4)
21+dnl AC_CONFIG_MACRO_DIR(m4)
22 AC_LANG(C)
23
24 dnl Compute the canonical host (run-time) system type variable
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb
index 152fa819a5..7a30690ec1 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.10.bb
@@ -4,10 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=34da3db46fab7501992f9615d7e158cf"
4 4
5CVE_PRODUCT = "libtiff" 5CVE_PRODUCT = "libtiff"
6 6
7SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ 7SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz"
8 file://libtool2.patch \
9 "
10
11SRC_URI[md5sum] = "114192d7ebe537912a2b97408832e7fd" 8SRC_URI[md5sum] = "114192d7ebe537912a2b97408832e7fd"
12SRC_URI[sha256sum] = "2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4" 9SRC_URI[sha256sum] = "2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4"
13 10