diff options
| author |   Ross Burton <ross@burtonini.com> | 2021-12-10 14:22:38 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-12 18:10:09 +0000 |
| commit | 000f129323e4fda3fed9d6d0e45f0bc0328a737e (patch) | |
| tree | aa21d5f6bb5e85a58fd3a750c46221d137771259 | |
| parent | 291654cb31ff3568f278d143510f1e9fac573966 (diff) | |
| download | openembedded-core-contrib-000f129323e4fda3fed9d6d0e45f0bc0328a737e.tar.gz | |
freetype: remove obsolete support for renamed libtool
libtool is now longer renamed to ${host}-libtool, so remove the changes
to support this.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/freetype/freetype/use-right-libtool.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-graphics/freetype/freetype_2.11.1.bb | 4 |
2 files changed, 1 insertions, 34 deletions
diff --git a/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch b/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch deleted file mode 100644 index b389455f5d..0000000000 --- a/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 50499e4482d40cff2ef05905c658ba4380e7e6fc Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Thu, 7 Jan 2016 21:13:07 +0000 -Subject: [PATCH] freetype: enable out-of-tree builds, and use host zlib - -Freetype think that it knows best about where libtool is, and explicitly the -libtool autoconf macros telling it where to find the libtool script. Of course -we prefix the script with the target triplet, so it's wrong. Fix this by -removing the forced assignment, so the configure script's knowledge of where it -put libtool is used. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - ---- - builds/unix/unix-cc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in -index 89be450..72609d3 100644 ---- a/builds/unix/unix-cc.in -+++ b/builds/unix/unix-cc.in -@@ -16,7 +16,7 @@ CC := @CC@ - COMPILER_SEP := $(SEP) - FT_LIBTOOL_DIR ?= $(PLATFORM_DIR) - --LIBTOOL := $(FT_LIBTOOL_DIR)/libtool -+LIBTOOL := $(FT_LIBTOOL_DIR)/@LIBTOOL@ --tag CC - - - # The object file extension (for standard and static libraries). This can be diff --git a/meta/recipes-graphics/freetype/freetype_2.11.1.bb b/meta/recipes-graphics/freetype/freetype_2.11.1.bb index 78babdcbdb..04b56adc6b 100644 --- a/meta/recipes-graphics/freetype/freetype_2.11.1.bb +++ b/meta/recipes-graphics/freetype/freetype_2.11.1.bb @@ -12,9 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=a5927784d823d443c6cae55701d01553 \ file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \ file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" -SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BP}.tar.xz \ - file://use-right-libtool.patch \ - " +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BP}.tar.xz" SRC_URI[sha256sum] = "3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8" UPSTREAM_CHECK_REGEX = "freetype-(?P<pver>\d+(\.\d+)+)" |