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:22 +0000 |
commit | ade08408788e869a50b1f5b04578089551a1dd09 (patch) | |
tree | 7c134b6d6d597e6d5b9dbc12ff8af970bfafeb74 /meta/recipes-graphics/freetype | |
parent | 4dd5f2d15492af1744da703e4809c53752f4dc96 (diff) | |
download | poky-ade08408788e869a50b1f5b04578089551a1dd09.tar.gz |
freetype: remove obsolete support for renamed libtool
libtool is now longer renamed to ${host}-libtool, so remove the changes
to support this.
(From OE-Core rev: 000f129323e4fda3fed9d6d0e45f0bc0328a737e)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/freetype')
-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 @@ | |||
1 | From 50499e4482d40cff2ef05905c658ba4380e7e6fc Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Thu, 7 Jan 2016 21:13:07 +0000 | ||
4 | Subject: [PATCH] freetype: enable out-of-tree builds, and use host zlib | ||
5 | |||
6 | Freetype think that it knows best about where libtool is, and explicitly the | ||
7 | libtool autoconf macros telling it where to find the libtool script. Of course | ||
8 | we prefix the script with the target triplet, so it's wrong. Fix this by | ||
9 | removing the forced assignment, so the configure script's knowledge of where it | ||
10 | put libtool is used. | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
14 | |||
15 | --- | ||
16 | builds/unix/unix-cc.in | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in | ||
20 | index 89be450..72609d3 100644 | ||
21 | --- a/builds/unix/unix-cc.in | ||
22 | +++ b/builds/unix/unix-cc.in | ||
23 | @@ -16,7 +16,7 @@ CC := @CC@ | ||
24 | COMPILER_SEP := $(SEP) | ||
25 | FT_LIBTOOL_DIR ?= $(PLATFORM_DIR) | ||
26 | |||
27 | -LIBTOOL := $(FT_LIBTOOL_DIR)/libtool | ||
28 | +LIBTOOL := $(FT_LIBTOOL_DIR)/@LIBTOOL@ --tag CC | ||
29 | |||
30 | |||
31 | # 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 \ | |||
12 | file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \ | 12 | file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \ |
13 | file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" | 13 | file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" |
14 | 14 | ||
15 | SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BP}.tar.xz \ | 15 | SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BP}.tar.xz" |
16 | file://use-right-libtool.patch \ | ||
17 | " | ||
18 | SRC_URI[sha256sum] = "3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8" | 16 | SRC_URI[sha256sum] = "3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8" |
19 | 17 | ||
20 | UPSTREAM_CHECK_REGEX = "freetype-(?P<pver>\d+(\.\d+)+)" | 18 | UPSTREAM_CHECK_REGEX = "freetype-(?P<pver>\d+(\.\d+)+)" |