vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed grub-emu build

This commit is contained in:
BVK Chaitanya 2010-08-18 20:25:16 +05:30
parent 019be613d0
commit 62f7d20835
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -806,11 +806,12 @@ fi
if test x"$device_mapper_excuse" = x ; then if test x"$device_mapper_excuse" = x ; then
# Check for device-mapper library. # Check for device-mapper library.
AC_CHECK_LIB([devmapper], [dm_task_create], AC_CHECK_LIB([devmapper], [dm_task_create],
[HOST_LDFLAGS="$HOST_LDFLAGS -ldevmapper" [LIBDEVMAPPER="-ldevmapper"
AC_DEFINE([HAVE_DEVICE_MAPPER], [1], AC_DEFINE([HAVE_DEVICE_MAPPER], [1],
[Define to 1 if you have the devmapper library.])], [Define to 1 if you have the devmapper library.])],
[device_mapper_excuse="need devmapper library"]) [device_mapper_excuse="need devmapper library"])
fi fi
AC_SUBST([LIBDEVMAPPER])
pkglibrootdir='$(libdir)'/`echo $PACKAGE | sed "$program_transform_name"` pkglibrootdir='$(libdir)'/`echo $PACKAGE | sed "$program_transform_name"`
AC_SUBST(pkglibrootdir) AC_SUBST(pkglibrootdir)

4
grub-core/modules.def
View File

@ -249,7 +249,7 @@ program = {
ldadd = 'kernel.img$(EXEEXT)'; ldadd = 'kernel.img$(EXEEXT)';
ldadd = '$(MODULE_FILES)'; ldadd = '$(MODULE_FILES)';
ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)'; ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)';
enable = emu; enable = emu;
}; };
@ -262,7 +262,7 @@ program = {
nodist = symlist.c; nodist = symlist.c;
ldadd = 'kernel.img$(EXEEXT)'; ldadd = 'kernel.img$(EXEEXT)';
ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)'; ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)';
enable = emu; enable = emu;
}; };

25
modules.def
View File

@ -99,7 +99,7 @@ program = {
name = grub-bin2h; name = grub-bin2h;
source = util/bin2h.c; source = util/bin2h.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL)'; ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
mansection = 1; mansection = 1;
}; };
@ -112,7 +112,7 @@ program = {
extra_dist = util/grub-mkimagexx.c; extra_dist = util/grub-mkimagexx.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL)'; ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"'; cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"';
}; };
@ -123,7 +123,7 @@ program = {
source = util/grub-mkrelpath.c; source = util/grub-mkrelpath.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL)'; ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
}; };
program = { program = {
@ -133,7 +133,7 @@ program = {
source = util/grub-script-check.c; source = util/grub-script-check.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL)'; ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
}; };
program = { program = {
@ -143,7 +143,7 @@ program = {
source = util/grub-editenv.c; source = util/grub-editenv.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL)'; ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
}; };
program = { program = {
@ -153,7 +153,7 @@ program = {
source = util/grub-mkpasswd-pbkdf2.c; source = util/grub-mkpasswd-pbkdf2.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL)'; ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
cflags = '$(CFLAGS_GCRY)'; cflags = '$(CFLAGS_GCRY)';
cppflags = '$(CPPFLAGS_GCRY)'; cppflags = '$(CPPFLAGS_GCRY)';
}; };
@ -181,7 +181,7 @@ program = {
source = util/grub-fstest.c; source = util/grub-fstest.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL)'; ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
condition = COND_GRUB_FSTEST; condition = COND_GRUB_FSTEST;
}; };
@ -194,7 +194,7 @@ program = {
cflags = '$(freetype_cflags)'; cflags = '$(freetype_cflags)';
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL)'; ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
ldflags = '$(freetype_libs)'; ldflags = '$(freetype_libs)';
condition = COND_GRUB_MKFONT; condition = COND_GRUB_MKFONT;
}; };
@ -213,8 +213,7 @@ program = {
sparc64_ieee1275 = util/ieee1275/devicemap.c; sparc64_ieee1275 = util/ieee1275/devicemap.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL)'; ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
ldflags = '$(LIBUTIL)';
}; };
program = { program = {
@ -224,8 +223,7 @@ program = {
source = util/grub-probe.c; source = util/grub-probe.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL)'; ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
ldflags = '$(LIBUTIL)';
}; };
program = { program = {
@ -242,8 +240,7 @@ program = {
sparc64_ieee1275 = util/lvm.c; sparc64_ieee1275 = util/lvm.c;
ldadd = libgrub.a; ldadd = libgrub.a;
ldflags = '$(LIBINTL)'; ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
ldflags = '$(LIBUTIL)';
enable = i386_pc; enable = i386_pc;
enable = sparc64_ieee1275; enable = sparc64_ieee1275;