diff options
author | Ross Burton <ross.burton@intel.com> | 2016-01-07 21:13:07 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-11 23:26:30 +0000 |
commit | 0d5e41f41d28b6a7ce7468145fc86c59ecb424f9 (patch) | |
tree | 7e2fe10c794a69e8df3718294df327ae79ec4566 /meta/recipes-graphics/freetype/freetype/use-right-libtool.patch | |
parent | 8f2ab19b25d3cade519e2f4c1e437c1597cec09d (diff) | |
download | poky-0d5e41f41d28b6a7ce7468145fc86c59ecb424f9.tar.gz |
freetype: enable out-of-tree builds, and use host zlib
Add a few ${S} and ${B} to make out of tree builds work, and stop using
autotools-brokensep. Annoyingly we still need to use a custom do_configure so
add a comment explaining why so someone else doesn't spend 30 minutes trying to
make it work.
Whilst here add a small patch so we don't need to tell the build where libtool
is, and remove class-native do_configure as it doesn't appear to be required
anymore.
At this point I started to get carried away.
The do_compile_prepend is redundant now that configure is being told what
compiler to use for build tools, so remove that.
Instead of using the integrated zlib fork, add a PACKAGECONFIG to use the zlib
we build and enable that by default. Also add a disabled PACKAGECONFIG for
bzip2 support.
(From OE-Core rev: 80b53d9366455f5e9f654fee53c685aa8fd365e7)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/freetype/freetype/use-right-libtool.patch')
-rw-r--r-- | meta/recipes-graphics/freetype/freetype/use-right-libtool.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch b/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch new file mode 100644 index 0000000000..20838813dc --- /dev/null +++ b/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Freetype think that it knows best about where libtool is, and explicitly the | ||
2 | libtool autoconf macros telling it where to find the libtool script. Of course | ||
3 | we prefix the script with the target triplet, so it's wrong. Fix this by | ||
4 | removing the forced assignment, so the configure script's knowledge of where it | ||
5 | put libtool is used. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
9 | |||
10 | --- freetype-2.6/builds/unix/unix-cc.in.orig 2016-01-07 19:21:45.244943479 +0000 | ||
11 | +++ freetype-2.6/builds/unix/unix-cc.in 2016-01-07 19:21:50.213112131 +0000 | ||
12 | @@ -19,1 +18,1 @@ | ||
13 | -LIBTOOL := $(FT_LIBTOOL_DIR)/libtool | ||
14 | +LIBTOOL := $(FT_LIBTOOL_DIR)/@LIBTOOL@ | ||