projects / portage-squeep / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
add deprecated sys-boot/grub:0
[portage-squeep] / sys-boot / grub / files / 2.02-freetype-capitalise-variables.patch
1 From ba84c8d1b4830e9fcb14d9f0e4a36e03ac40a09d Mon Sep 17 00:00:00 2001
2 From: Colin Watson <cjwatson@ubuntu.com>
3 Date: Tue, 30 Jan 2018 14:08:26 +0000
4 Subject: build: Capitalise *freetype_* variables
5
6 Using FREETYPE_CFLAGS and FREETYPE_LIBS is more in line with the naming
7 scheme used by pkg-config macros.
8
9 Bug-Debian: https://bugs.debian.org/887721
10 Last-Update: 2018-02-11
11
12 Patch-Name: freetype-capitalise-variables.patch
13 ---
14 Makefile.am | 6 +++---
15 Makefile.util.def | 4 ++--
16 configure.ac | 24 ++++++++++++------------
17 3 files changed, 17 insertions(+), 17 deletions(-)
18
19 diff --git a/Makefile.am b/Makefile.am
20 index f0ab1adc3..b47b4b1ac 100644
21 --- a/Makefile.am
22 +++ b/Makefile.am
23 @@ -71,7 +71,7 @@ endif
24 starfield_theme_files = $(srcdir)/themes/starfield/blob_w.png $(srcdir)/themes/starfield/boot_menu_c.png $(srcdir)/themes/starfield/boot_menu_e.png $(srcdir)/themes/starfield/boot_menu_ne.png $(srcdir)/themes/starfield/boot_menu_n.png $(srcdir)/themes/starfield/boot_menu_nw.png $(srcdir)/themes/starfield/boot_menu_se.png $(srcdir)/themes/starfield/boot_menu_s.png $(srcdir)/themes/starfield/boot_menu_sw.png $(srcdir)/themes/starfield/boot_menu_w.png $(srcdir)/themes/starfield/slider_c.png $(srcdir)/themes/starfield/slider_n.png $(srcdir)/themes/starfield/slider_s.png $(srcdir)/themes/starfield/starfield.png $(srcdir)/themes/starfield/terminal_box_c.png $(srcdir)/themes/starfield/terminal_box_e.png $(srcdir)/themes/starfield/terminal_box_ne.png $(srcdir)/themes/starfield/terminal_box_n.png $(srcdir)/themes/starfield/terminal_box_nw.png $(srcdir)/themes/starfield/terminal_box_se.png $(srcdir)/themes/starfield/terminal_box_s.png $(srcdir)/themes/starfield/terminal_box_sw.png $(srcdir)/themes/starfield/terminal_box_w.png $(srcdir)/themes/starfield/theme.txt $(srcdir)/themes/starfield/README $(srcdir)/themes/starfield/COPYING.CC-BY-SA-3.0
25
26 build-grub-mkfont$(BUILD_EXEEXT): util/grub-mkfont.c grub-core/unidata.c grub-core/kern/emu/misc.c util/misc.c
27 - $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-mkfont\" $^ $(build_freetype_cflags) $(build_freetype_libs)
28 + $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-mkfont\" $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS)
29 CLEANFILES += build-grub-mkfont$(BUILD_EXEEXT)
30
31 garbage-gen$(BUILD_EXEEXT): util/garbage-gen.c
32 @@ -80,11 +80,11 @@ CLEANFILES += garbage-gen$(BUILD_EXEEXT)
33 EXTRA_DIST += util/garbage-gen.c
34
35 build-grub-gen-asciih$(BUILD_EXEEXT): util/grub-gen-asciih.c
36 - $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
37 + $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) -Wall -Werror
38 CLEANFILES += build-grub-gen-asciih$(BUILD_EXEEXT)
39
40 build-grub-gen-widthspec$(BUILD_EXEEXT): util/grub-gen-widthspec.c
41 - $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
42 + $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(BUILD_FREETYPE_CFLAGS) $(BUILD_FREETYPE_LIBS) -Wall -Werror
43 CLEANFILES += build-grub-gen-widthspec$(BUILD_EXEEXT)
44
45 if COND_STARFIELD
46 diff --git a/Makefile.util.def b/Makefile.util.def
47 index 168acbe59..fa39d8bd1 100644
48 --- a/Makefile.util.def
49 +++ b/Makefile.util.def
50 @@ -302,14 +302,14 @@ program = {
51 common = grub-core/kern/emu/argp_common.c;
52 common = grub-core/osdep/init.c;
53
54 - cflags = '$(freetype_cflags)';
55 + cflags = '$(FREETYPE_CFLAGS)';
56 cppflags = '-DGRUB_MKFONT=1';
57
58 ldadd = libgrubmods.a;
59 ldadd = libgrubgcry.a;
60 ldadd = libgrubkern.a;
61 ldadd = grub-core/gnulib/libgnu.a;
62 - ldadd = '$(freetype_libs)';
63 + ldadd = '$(FREETYPE_LIBS)';
64 ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
65 condition = COND_GRUB_MKFONT;
66 };
67 diff --git a/configure.ac b/configure.ac
68 index cd1f49837..85c23bd62 100644
69 --- a/configure.ac
70 +++ b/configure.ac
71 @@ -1505,12 +1505,12 @@ unset ac_cv_header_ft2build_h
72
73 if test x"$grub_mkfont_excuse" = x ; then
74 # Check for freetype libraries.
75 - freetype_cflags=`$FREETYPE --cflags`
76 - freetype_libs=`$FREETYPE --libs`
77 + FREETYPE_CFLAGS=`$FREETYPE --cflags`
78 + FREETYPE_LIBS=`$FREETYPE --libs`
79 SAVED_CPPFLAGS="$CPPFLAGS"
80 SAVED_LIBS="$LIBS"
81 - CPPFLAGS="$CPPFLAGS $freetype_cflags"
82 - LIBS="$LIBS $freetype_libs"
83 + CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
84 + LIBS="$LIBS $FREETYPE_LIBS"
85 AC_CHECK_HEADERS([ft2build.h], [],
86 [grub_mkfont_excuse=["need freetype2 headers"]])
87 AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], [grub_mkfont_excuse=["freetype2 library unusable"]])
88 @@ -1527,8 +1527,8 @@ else
89 enable_grub_mkfont=no
90 fi
91 AC_SUBST([enable_grub_mkfont])
92 -AC_SUBST([freetype_cflags])
93 -AC_SUBST([freetype_libs])
94 +AC_SUBST([FREETYPE_CFLAGS])
95 +AC_SUBST([FREETYPE_LIBS])
96
97 SAVED_CC="$CC"
98 SAVED_CPP="$CPP"
99 @@ -1566,12 +1566,12 @@ fi
100
101 if test x"$grub_build_mkfont_excuse" = x ; then
102 # Check for freetype libraries.
103 - build_freetype_cflags=`$BUILD_FREETYPE --cflags`
104 - build_freetype_libs=`$BUILD_FREETYPE --libs`
105 + BUILD_FREETYPE_CFLAGS=`$BUILD_FREETYPE --cflags`
106 + BUILD_FREETYPE_LIBS=`$BUILD_FREETYPE --libs`
107 SAVED_CPPFLAGS_2="$CPPFLAGS"
108 SAVED_LIBS="$LIBS"
109 - CPPFLAGS="$CPPFLAGS $build_freetype_cflags"
110 - LIBS="$LIBS $build_freetype_libs"
111 + CPPFLAGS="$CPPFLAGS $BUILD_FREETYPE_CFLAGS"
112 + LIBS="$LIBS $BUILD_FREETYPE_LIBS"
113 AC_CHECK_HEADERS([ft2build.h], [],
114 [grub_build_mkfont_excuse=["need freetype2 headers"]])
115 AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], [grub_build_mkfont_excuse=["freetype2 library unusable"]])
116 @@ -1595,8 +1595,8 @@ if test x"$enable_build_grub_mkfont" = xno && ( test "x$platform" = xqemu || tes
117 fi
118 fi
119
120 -AC_SUBST([build_freetype_cflags])
121 -AC_SUBST([build_freetype_libs])
122 +AC_SUBST([BUILD_FREETYPE_CFLAGS])
123 +AC_SUBST([BUILD_FREETYPE_LIBS])
124
125 CC="$SAVED_CC"
126 CPP="$SAVED_CPP"
squeep portage overlay - a collection of site-local gentoo packages