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:23:16 +0000 |
| commit | 80b53d9366455f5e9f654fee53c685aa8fd365e7 (patch) | |
| tree | c27f4eeac594978d96998a02dcebed8771579dc6 /meta/recipes-graphics/freetype/freetype/use-right-libtool.patch | |
| parent | 0a556af62b509f9defd8ac5b3a6648bdfe1dff67 (diff) | |
| download | openembedded-core-contrib-80b53d9366455f5e9f654fee53c685aa8fd365e7.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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 @@ +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> + +--- freetype-2.6/builds/unix/unix-cc.in.orig 2016-01-07 19:21:45.244943479 +0000 ++++ freetype-2.6/builds/unix/unix-cc.in 2016-01-07 19:21:50.213112131 +0000 +@@ -19,1 +18,1 @@ +-LIBTOOL := $(FT_LIBTOOL_DIR)/libtool ++LIBTOOL := $(FT_LIBTOOL_DIR)/@LIBTOOL@ |