Hi,
This fixes the emu build when libzfs is in use. Note that changes to
$top_srcdir/Makefile.util.def are also required -- effectively just inserting
"$(LIBZFS) $(LIBNVPAIR)" to the ldadd lines of each util program.
=== modified file 'grub-core/Makefile.core.def'
--- grub-core/Makefile.core.def 2010-08-31 23:29:58 +0000
+++ grub-core/Makefile.core.def 2010-09-01 02:00:30 +0000
@@ -157,6 +157,7 @@
emu = disk/host.c;
emu = gnulib/progname.c;
+ emu = gnulib/error.c;
emu = kern/emu/console.c;
emu = kern/emu/getroot.c;
emu = kern/emu/hostdisk.c;
@@ -180,7 +181,7 @@
ldadd = 'kernel.img$(EXEEXT)';
ldadd = '$(MODULE_FILES)';
- ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)
$(LIBDEVMAPPER)';
+ ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)
$(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
enable = emu;
};
@@ -193,7 +194,7 @@
emu_nodist = symlist.c;
ldadd = 'kernel.img$(EXEEXT)';
- ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)
$(LIBDEVMAPPER)';
+ ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)
$(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
enable = emu;
};
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
