Skip to content

Commit 53053ca

Browse files
phcoderphcoder
committed
Handle grub-pe2elf and grub-mkfont for cases when build != host.
 * Makefile.am (build-grub-mkfont): Don't include gnulib. (build-grub-gen-asciih): Likewise. (build-grub-gen-widthspec): Likewise. * Makefile.util.def (grub-pe2elf): Remove. * config.h.in [GRUB_BUILD]: Use build rather than host constants. * configure.ac: Separate tests for build. Move ./build-grub-pe2elf to grub-core. Fix typo. * grub-core/Makefile.am (build-grub-pe2elf): New target. * grub-core/kern/emu/misc.c (xasprintf): Don't compile if GRUB_BUILD is defined. * include/grub/types.h [GRUB_BUILD]: Use build rather than host constants. * util/grub-mkfont.c [GRUB_BUILD]: Simplify not to rely on argp. * util/grub-pe2elf.c: Simplify not to rely on getopt. * util/misc.c (program_name) [GRUB_BUILD]: Define to static string.
1 parent fe427aa commit 53053ca

File tree

11 files changed

+174
-102
lines changed

11 files changed

+174
-102
lines changed

‎ChangeLog

+21
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
2013-08-22 Vladimir Serbinenko <[email protected]>
2+
3+
Handle grub-pe2elf and grub-mkfont for cases when build != host.
4+
5+
* Makefile.am (build-grub-mkfont): Don't include gnulib.
6+
(build-grub-gen-asciih): Likewise.
7+
(build-grub-gen-widthspec): Likewise.
8+
* Makefile.util.def (grub-pe2elf): Remove.
9+
* config.h.in [GRUB_BUILD]: Use build rather than host constants.
10+
* configure.ac: Separate tests for build.
11+
Move ./build-grub-pe2elf to grub-core.
12+
Fix typo.
13+
* grub-core/Makefile.am (build-grub-pe2elf): New target.
14+
* grub-core/kern/emu/misc.c (xasprintf): Don't compile if GRUB_BUILD is
15+
defined.
16+
* include/grub/types.h [GRUB_BUILD]: Use build rather than host
17+
constants.
18+
* util/grub-mkfont.c [GRUB_BUILD]: Simplify not to rely on argp.
19+
* util/grub-pe2elf.c: Simplify not to rely on getopt.
20+
* util/misc.c (program_name) [GRUB_BUILD]: Define to static string.
21+
122
2013-08-22 Vladimir Serbinenko <[email protected]>
223

324
* grub-core/kern/emu/hostdisk.c (grub_util_get_fd_size): Adapt for

‎Makefile.am

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ endif
6666

6767
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
6868

69-
build-grub-mkfont: util/grub-mkfont.c grub-core/unidata.c grub-core/kern/emu/argp_common.c grub-core/kern/emu/misc.c util/misc.c grub-core/gnulib/progname.c
70-
$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -I$(top_srcdir)/grub-core/gnulib -DGRUB_MKFONT=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) $(LIBINTL)
69+
build-grub-mkfont: util/grub-mkfont.c grub-core/unidata.c grub-core/kern/emu/misc.c util/misc.c
70+
$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-mkfont\" $^ $(build_freetype_cflags) $(build_freetype_libs)
7171

7272
build-grub-gen-asciih: util/grub-gen-asciih.c
73-
$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -I$(top_srcdir)/grub-core/gnulib -DGRUB_MKFONT=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) $(LIBINTL) -Wall -Werror
73+
$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
7474

7575
build-grub-gen-widthspec: util/grub-gen-widthspec.c
76-
$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -I$(top_srcdir)/grub-core/gnulib -DGRUB_MKFONT=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) $(LIBINTL) -Wall -Werror
76+
$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
7777

7878
if COND_STARFIELD
7979
starfield_DATA = dejavu_10.pf2 dejavu_12.pf2 dejavu_bold_14.pf2 dejavu_14.pf2 dejavu_16.pf2 $(starfield_theme_files)

‎Makefile.util.def

-13
Original file line numberDiff line numberDiff line change
@@ -231,19 +231,6 @@ program = {
231231
condition = COND_APPLE_CC;
232232
};
233233

234-
program = {
235-
name = grub-pe2elf;
236-
mansection = 1;
237-
common = util/grub-pe2elf.c;
238-
239-
ldadd = libgrubmods.a;
240-
ldadd = libgrubgcry.a;
241-
ldadd = libgrubkern.a;
242-
ldadd = grub-core/gnulib/libgnu.a;
243-
ldadd = '$(LIBINTL)';
244-
condition = COND_GRUB_PE2ELF;
245-
};
246-
247234
program = {
248235
name = grub-fstest;
249236
mansection = 1;

‎config.h.in

+13-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,19 @@
1010
#define DISK_CACHE_STATS @DISK_CACHE_STATS@
1111
#define BOOT_TIME_STATS @BOOT_TIME_STATS@
1212

13-
#if defined (GRUB_UTIL) || !defined (GRUB_MACHINE)
13+
#if defined (GRUB_BUILD)
14+
#define BUILD_SIZEOF_LONG @BUILD_SIZEOF_LONG@
15+
#define BUILD_SIZEOF_VOID_P @BUILD_SIZEOF_VOID_P@
16+
#if defined __APPLE__
17+
# if defined __BIG_ENDIAN__
18+
# define BUILD_WORDS_BIGENDIAN 1
19+
# else
20+
# define BUILD_WORDS_BIGENDIAN 0
21+
# endif
22+
#else
23+
#define BUILD_WORDS_BIGENDIAN @BUILD_WORDS_BIGENDIAN@
24+
#endif
25+
#elif defined (GRUB_UTIL) || !defined (GRUB_MACHINE)
1426
#include <config-util.h>
1527
#else
1628
/* Define if C symbols get an underscore after compilation. */

‎configure.ac

+25-6
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,8 @@ AM_GNU_GETTEXT([external])
331331
AC_SYS_LARGEFILE
332332

333333
# Identify characteristics of the host architecture.
334+
unset ac_cv_c_bigendian
335+
334336
AC_C_BIGENDIAN
335337
AC_CHECK_SIZEOF(void *)
336338
AC_CHECK_SIZEOF(long)
@@ -556,7 +558,7 @@ AC_SUBST(TARGET_LDFLAGS_OLDMAGIC)
556558
# For platforms where ELF is not the default link format.
557559
AC_MSG_CHECKING([for command to convert module to ELF format])
558560
case "${target_os}" in
559-
cygwin) TARGET_OBJ2ELF='$(top_builddir)/grub-pe2elf';
561+
cygwin) TARGET_OBJ2ELF='./build-grub-pe2elf';
560562
# FIXME: put proper test here
561563
NEED_REGISTER_FRAME_INFO=1
562564
;;
@@ -966,6 +968,8 @@ if test x"$grub_mkfont_excuse" = x ; then
966968
fi
967969
fi
968970

971+
unset ac_cv_header_ft2build_h
972+
969973
if test x"$grub_mkfont_excuse" = x ; then
970974
# Check for freetype libraries.
971975
freetype_cflags=`$FREETYPE --cflags`
@@ -994,11 +998,26 @@ SAVED_CFLAGS="$CFLAGS"
994998
SAVED_CPPFLAGS="$CPPFLAGS"
995999
CC="$BUILD_CC"
9961000
CFLAGS="$BUILD_CFLAGS"
997-
CPPFLAGS="$SAVED_CPPFLAGS"
1001+
CPPFLAGS="$BUILD_CPPFLAGS"
1002+
1003+
unset ac_cv_c_bigendian
1004+
unset ac_cv_header_ft2build_h
1005+
1006+
AC_COMPUTE_INT([BUILD_SIZEOF_VOID_P], [sizeof (void *)])
1007+
AC_COMPUTE_INT([BUILD_SIZEOF_LONG], [sizeof (long)])
1008+
AC_C_BIGENDIAN([BUILD_WORDS_BIGENDIAN=1], [BUILD_WORDS_BIGENDIAN=0], [BUILD_WORDS_BIGENDIAN=err], [BUILD_WORDS_BIGENDIAN=err])
1009+
1010+
if test x$BUILD_WORDS_BIGENDIAN = xerr ; then
1011+
AC_MSG_ERROR([couldnt determine build endianness])
1012+
fi
1013+
1014+
AC_SUBST([BUILD_SIZEOF_LONG])
1015+
AC_SUBST([BUILD_SIZEOF_VOID_P])
1016+
AC_SUBST([BUILD_WORDS_BIGENDIAN])
9981017

9991018
if test x"$grub_build_mkfont_excuse" = x ; then
10001019
# Check for freetype libraries.
1001-
AC_CHECK_TOOLS([BUILD_FREETYPE], [freetype-config])
1020+
AC_CHECK_PROGS([BUILD_FREETYPE], [freetype-config])
10021021
if test "x$BUILD_FREETYPE" = x ; then
10031022
grub_build_mkfont_excuse=["need freetype2 library"]
10041023
fi
@@ -1081,7 +1100,7 @@ fi
10811100

10821101
AC_SUBST([FONT_SOURCE])
10831102

1084-
if test x"$FONT_SOURCE" = x && test x"$DJVU_FONT_SOURCE" = x; then
1103+
if test x"$FONT_SOURCE" = x && test x"$DJVU_FONT_SOURCE" = x && test x"$grub_build_mkfont_excuse" = x; then
10851104
grub_build_mkfont_excuse="no fonts"
10861105
fi
10871106

@@ -1376,15 +1395,15 @@ echo With libzfs support: Yes
13761395
else
13771396
echo With libzfs support: No "($libzfs_excuse)"
13781397
fi
1379-
if [ x"$build_grub_mkfont_excuse" = x ]; then
1398+
if [ x"$grub_build_mkfont_excuse" = x ]; then
13801399
echo Build-time grub-mkfont: Yes
13811400
if test "x$FONT_SOURCE" = x ; then
13821401
echo "Without unifont"
13831402
else
13841403
echo "With unifont from $FONT_SOURCE"
13851404
fi
13861405
else
1387-
echo Build-time grub-mkfont: No "($build_grub_mkfont_excuse)"
1406+
echo Build-time grub-mkfont: No "($grub_build_mkfont_excuse)"
13881407
echo "Without unifont (no build-time grub-mkfont)"
13891408
fi
13901409
if test "x$LIBLZMA" = x ; then

‎grub-core/Makefile.am

+3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ CFLAGS_LIBRARY += $(CFLAGS_PLATFORM) -fno-builtin
2828
CPPFLAGS_LIBRARY += $(CPPFLAGS_PLATFORM)
2929
CCASFLAGS_LIBRARY += $(CCASFLAGS_PLATFORM)
3030

31+
build-grub-pe2elf: $(top_srcdir)/util/grub-pe2elf.c $(top_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c
32+
$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-pe2elf\" $^
33+
3134
# gentrigtables
3235
gentrigtables: gentrigtables.c
3336
$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -lm

‎grub-core/kern/emu/misc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ xstrdup (const char *str)
137137
return newstr;
138138
}
139139

140-
#ifndef GRUB_MKFONT
140+
#if !defined (GRUB_MKFONT) && !defined (GRUB_BUILD)
141141
char *
142142
xasprintf (const char *fmt, ...)
143143
{

‎include/grub/types.h

+9-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,15 @@
2424
#include <grub/cpu/types.h>
2525
#endif
2626

27-
#ifdef GRUB_UTIL
27+
#ifdef GRUB_BUILD
28+
# define GRUB_CPU_SIZEOF_VOID_P BUILD_SIZEOF_VOID_P
29+
# define GRUB_CPU_SIZEOF_LONG BUILD_SIZEOF_LONG
30+
# if BUILD_WORDS_BIGENDIAN
31+
# define GRUB_CPU_WORDS_BIGENDIAN 1
32+
# else
33+
# undef GRUB_CPU_WORDS_BIGENDIAN
34+
# endif
35+
#elif defined (GRUB_UTIL)
2836
# define GRUB_CPU_SIZEOF_VOID_P SIZEOF_VOID_P
2937
# define GRUB_CPU_SIZEOF_LONG SIZEOF_LONG
3038
# ifdef WORDS_BIGENDIAN

‎util/grub-mkfont.c

+82-9
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,14 @@
3131
#include <stdlib.h>
3232
#include <string.h>
3333

34+
#ifndef GRUB_BUILD
3435
#define _GNU_SOURCE 1
3536
#include <argp.h>
37+
#endif
3638
#include <assert.h>
3739

40+
#include <errno.h>
41+
3842
#include <ft2build.h>
3943
#include FT_FREETYPE_H
4044
#include FT_TRUETYPE_TAGS_H
@@ -47,7 +51,9 @@
4751
#define FT_ERROR_END_LIST };
4852
#include FT_ERRORS_H
4953

54+
#ifndef GRUB_BUILD
5055
#include "progname.h"
56+
#endif
5157

5258
#define GRUB_FONT_DEFAULT_SIZE 16
5359

@@ -919,13 +925,10 @@ write_font_pf2 (struct grub_font_info *font_info, char *output_file)
919925
fclose (file);
920926
}
921927

928+
#ifndef GRUB_BUILD
922929
static struct argp_option options[] = {
923930
{"output", 'o', N_("FILE"), 0, N_("save output in FILE [required]"), 0},
924931
/* TRANSLATORS: bitmaps are images like e.g. in JPEG. */
925-
{"width-spec", 0x103, 0, 0,
926-
/* TRANSLATORS: this refers to creating a file containing the width of
927-
every glyph but not the glyphs themselves. */
928-
N_("create width summary file"), 0},
929932
{"index", 'i', N_("NUM"), 0,
930933
/* TRANSLATORS: some font files may have multiple faces (fonts).
931934
This option is used to chose among them, the first face being '0'.
@@ -953,6 +956,23 @@ static struct argp_option options[] = {
953956
{"verbose", 'v', 0, 0, N_("print verbose messages."), 0},
954957
{ 0, 0, 0, 0, 0, 0 }
955958
};
959+
#define my_argp_parse argp_parse
960+
#define MY_ARGP_KEY_ARG ARGP_KEY_ARG
961+
#define my_error_t error_t
962+
#define MY_ARGP_ERR_UNKNOWN ARGP_ERR_UNKNOWN
963+
964+
#else
965+
966+
#define my_error_t int
967+
#define MY_ARGP_ERR_UNKNOWN -1
968+
#define MY_ARGP_KEY_ARG -1
969+
#define my_argp_parse(a, argc, argv, b, c, st) my_argp_parse_real(argc, argv, st)
970+
struct my_argp_state
971+
{
972+
void *input;
973+
};
974+
975+
#endif
956976

957977
struct arguments
958978
{
@@ -966,8 +986,15 @@ struct arguments
966986
enum file_formats file_format;
967987
};
968988

969-
static error_t
970-
argp_parser (int key, char *arg, struct argp_state *state)
989+
static int
990+
has_argument (int v)
991+
{
992+
return v =='o' || v == 'i' || v == 'r' || v == 'n' || v == 's'
993+
|| v == 'd' || v == 'c';
994+
}
995+
996+
static my_error_t
997+
argp_parser (int key, char *arg, struct my_argp_state *state)
971998
{
972999
/* Get the input argument from argp_parse, which we
9731000
know is a pointer to our arguments structure. */
@@ -1055,30 +1082,76 @@ argp_parser (int key, char *arg, struct argp_state *state)
10551082
font_verbosity++;
10561083
break;
10571084

1058-
case ARGP_KEY_ARG:
1085+
case MY_ARGP_KEY_ARG:
10591086
assert (arguments->nfiles < arguments->files_max);
10601087
arguments->files[arguments->nfiles++] = xstrdup(arg);
10611088
break;
10621089

10631090
default:
1064-
return ARGP_ERR_UNKNOWN;
1091+
return MY_ARGP_ERR_UNKNOWN;
1092+
}
1093+
return 0;
1094+
}
1095+
1096+
#ifdef GRUB_BUILD
1097+
1098+
/* We don't require host platform to have argp. In the same time configuring
1099+
gnulib for build would result in even worse mess. So we have our
1100+
minimalistic argp replacement just enough for build system. Most
1101+
argp features are omitted. */
1102+
1103+
static int
1104+
my_argp_parse_real (int argc, char **argv, void *st)
1105+
{
1106+
int curar;
1107+
struct my_argp_state p;
1108+
1109+
p.input = st;
1110+
1111+
for (curar = 1; curar < argc; )
1112+
{
1113+
if (argv[curar][0] == '-')
1114+
{
1115+
if (has_argument (argv[curar][1])
1116+
&& curar + 1 >= argc)
1117+
return 1;
1118+
if (has_argument (argv[curar][1]))
1119+
{
1120+
if (argp_parser (argv[curar][1], argv[curar + 1], &p))
1121+
return 1;
1122+
curar += 2;
1123+
continue;
1124+
}
1125+
if (argp_parser (argv[curar][1], NULL, &p))
1126+
return 1;
1127+
curar++;
1128+
continue;
1129+
}
1130+
if (argp_parser (MY_ARGP_KEY_ARG, argv[curar], &p))
1131+
return 1;
1132+
curar++;
10651133
}
10661134
return 0;
10671135
}
1136+
#endif
10681137

1138+
#ifndef GRUB_BUILD
10691139
static struct argp argp = {
10701140
options, argp_parser, N_("[OPTIONS] FONT_FILES"),
10711141
N_("Convert common font file formats into PF2"),
10721142
NULL, NULL, NULL
10731143
};
1144+
#endif
10741145

10751146
int
10761147
main (int argc, char *argv[])
10771148
{
10781149
FT_Library ft_lib;
10791150
struct arguments arguments;
10801151

1152+
#ifndef GRUB_BUILD
10811153
set_program_name (argv[0]);
1154+
#endif
10821155

10831156
grub_util_init_nls ();
10841157

@@ -1090,7 +1163,7 @@ main (int argc, char *argv[])
10901163
memset (arguments.files, 0, (arguments.files_max + 1)
10911164
* sizeof (arguments.files[0]));
10921165

1093-
if (argp_parse (&argp, argc, argv, 0, 0, &arguments) != 0)
1166+
if (my_argp_parse (&argp, argc, argv, 0, 0, &arguments) != 0)
10941167
{
10951168
fprintf (stderr, "%s", _("Error in parsing command line arguments\n"));
10961169
exit(1);

0 commit comments

Comments
 (0)