diff options
author | Pol Vinogradov | 2014-10-10 15:01:56 -0400 |
---|---|---|
committer | Pol Vinogradov | 2014-10-10 15:01:56 -0400 |
commit | 2896212307fc9b963cccabfa4f88eb2f4ab36949 (patch) | |
tree | 1f2babe9eaef193e0c526961575a7be8a0e28ead | |
parent | 1585ad06d171d6df99d9485a96a222407f431dc4 (diff) |
disk/grub2: fixed binary names, gcc flag matching and building with current freetype2
-rwxr-xr-x | disk/grub2/BUILD | 3 | ||||
-rw-r--r-- | disk/grub2/HISTORY | 6 | ||||
-rwxr-xr-x | disk/grub2/PRE_BUILD | 3 | ||||
-rw-r--r-- | disk/grub2/grub-2.00-freetype-2.5.1.patch | 24 |
4 files changed, 34 insertions, 2 deletions
diff --git a/disk/grub2/BUILD b/disk/grub2/BUILD index eb7ffdf1a5..e0dd644130 100755 --- a/disk/grub2/BUILD +++ b/disk/grub2/BUILD @@ -1,8 +1,7 @@ OPTS="${OPTS} ${GRUB2_OPTS} -disable-werror" && OPTS="$OPTS --with-platform=${GRUB2_PLATFORM%/*}" && -OPTS="$OPTS --target=${GRUB2_PLATFORM#*/}" && CFLAGS=${CFLAGS//-m64/} && -CFLAGS=${CFLAGS//-O?/-Os} && +CFLAGS=${CFLAGS//-O(\d|fast)/-Os} && LDFLAGS=${LDFLAGS//-s /} && LDFLAGS=${LDFLAGS%-s} && disable_pic force && diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY index c4f0b4c9d0..cd678f86c8 100644 --- a/disk/grub2/HISTORY +++ b/disk/grub2/HISTORY @@ -1,3 +1,9 @@ +2014-10-10 Pol Vinogradov <vin.public@gmail.com> + * BUILD: removed --target flag, it makes mangled binary names, + fixed regexp for gcc's -O flag, now it matches -Ofast as well + * PRE_BUILD, grub-2.00-freetype-2.5.1.patch: added a patch from Gentoo, + fixes compilation with current freetype2 + 2014-03-09 Remko van der Vossen <wich@sourcemage.org> * BUILD: Do not strip objects, it leads to a broken grub diff --git a/disk/grub2/PRE_BUILD b/disk/grub2/PRE_BUILD index ceb321f63e..70e263d8ad 100755 --- a/disk/grub2/PRE_BUILD +++ b/disk/grub2/PRE_BUILD @@ -5,6 +5,9 @@ patch "${SOURCE_DIRECTORY}"/grub-core/gnulib/stdio.in.h \ "${SPELL_DIRECTORY}"/glibc-2.16.patch && cd ${SOURCE_DIRECTORY} && + +patch -p1 < ${SPELL_DIRECTORY}/grub-2.00-freetype-2.5.1.patch && + if [[ "${GRUB2_SVN}" = 'y' ]]; then ./autogen.sh else diff --git a/disk/grub2/grub-2.00-freetype-2.5.1.patch b/disk/grub2/grub-2.00-freetype-2.5.1.patch new file mode 100644 index 0000000000..286830ccf8 --- /dev/null +++ b/disk/grub2/grub-2.00-freetype-2.5.1.patch @@ -0,0 +1,24 @@ +commit fd0df6d098b1e6a4f60275c48a3ec88d15ba1fbb +Author: Colin Watson <cjwatson@ubuntu.com> +Date: Fri Nov 29 12:19:36 2013 +0000 + + Fix build with FreeType 2.5.1 + + * util/grub-gen-asciih.c: Include FT_SYNTHESIS_H rather than + <freetype/ftsynth.h>, fixing build with FreeType 2.5.1. + * util/grub-gen-widthspec.c: Likewise. + * util/grub-mkfont.c: Likewise. + +diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c +index 0d8eb78..242dd01 100644 +--- a/util/grub-mkfont.c ++++ b/util/grub-mkfont.c +@@ -43,7 +43,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[] = { |