including freetype header directly leads
to build error:
util/grub-mkfont.c:42:30: fatal error: freetype/ftsynth.h: No such file or 
directory
Observed on Debian Testing, because new Freetype2 
changed include location there

add a patch to grub - use provided #include macros documented:
http://www.freetype.org/freetype2/docs/reference/ft2-header_file_macros.html#FT_SYNTHESIS_H

Signed-off-by: Dirk Neukirchen <dirkneukirc...@web.de>
---
 package/boot/grub2/Makefile                               |  1 +
 package/boot/grub2/patches/101-freetype2_fix_mkfont.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 package/boot/grub2/patches/101-freetype2_fix_mkfont.patch

diff --git a/package/boot/grub2/Makefile b/package/boot/grub2/Makefile
index dd490ff..0f66354 100644
--- a/package/boot/grub2/Makefile
+++ b/package/boot/grub2/Makefile
@@ -18,6 +18,7 @@ PKG_MD5SUM:=e927540b6eda8b024fb0391eeaa4091c
 
 HOST_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=grub2/host
+PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/boot/grub2/patches/101-freetype2_fix_mkfont.patch 
b/package/boot/grub2/patches/101-freetype2_fix_mkfont.patch
new file mode 100644
index 0000000..fc9f146
--- /dev/null
+++ b/package/boot/grub2/patches/101-freetype2_fix_mkfont.patch
@@ -0,0 +1,11 @@
+--- a/util/grub-mkfont.c
++++ b/util/grub-mkfont.c
+@@ -39,7 +39,7 @@
+ #include FT_FREETYPE_H
+ #include FT_TRUETYPE_TAGS_H
+ #include FT_TRUETYPE_TABLES_H
+-#include <freetype/ftsynth.h>
++#include FT_SYNTHESIS_H
+ 
+ #undef __FTERRORS_H__
+ #define FT_ERROR_START_LIST   const char *ft_errmsgs[] = { 
-- 
1.8.4.4

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature

_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Reply via email to