mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-21 06:49:35 +00:00
Fix solaris compilation.
* grub-core/Makefile.core.def (kernel): Include gnulib/error.c on emu. (grub-emu): Add LIBZFS and LIBNVPAIR to ldadd. (grub-emu-list): Likewise.
This commit is contained in:
1 parent
545b752f88
commit
5fe7620a4e
2 files changed
+11
-2
No files matched your search
@@ -1,3 +1,11 @@
|
|||||||
|
2010-09-14 Seth Goldberg <seth.goldberg@oracle.com>
|
||||||
|
|
||||||
|
Fix solaris compilation.
|
||||||
|
|
||||||
|
* grub-core/Makefile.core.def (kernel): Include gnulib/error.c on emu.
|
||||||
|
(grub-emu): Add LIBZFS and LIBNVPAIR to ldadd.
|
||||||
|
(grub-emu-list): Likewise.
|
||||||
|
|
||||||
2010-09-14 Vladimir Serbinenko <phcoder@gmail.com>
|
2010-09-14 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
Remove deprecated root command.
|
Remove deprecated root command.
|
||||||
|
|||||||
@@ -150,6 +150,7 @@ kernel = {
|
|||||||
|
|
||||||
emu = disk/host.c;
|
emu = disk/host.c;
|
||||||
emu = gnulib/progname.c;
|
emu = gnulib/progname.c;
|
||||||
|
emu = gnulib/error.c;
|
||||||
emu = kern/emu/console.c;
|
emu = kern/emu/console.c;
|
||||||
emu = kern/emu/getroot.c;
|
emu = kern/emu/getroot.c;
|
||||||
emu = kern/emu/hostdisk.c;
|
emu = kern/emu/hostdisk.c;
|
||||||
@@ -187,7 +188,7 @@ program = {
|
|||||||
|
|
||||||
ldadd = 'kernel.img$(EXEEXT)';
|
ldadd = 'kernel.img$(EXEEXT)';
|
||||||
ldadd = '$(MODULE_FILES)';
|
ldadd = '$(MODULE_FILES)';
|
||||||
ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)';
|
ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
|
||||||
|
|
||||||
enable = emu;
|
enable = emu;
|
||||||
};
|
};
|
||||||
@@ -200,7 +201,7 @@ program = {
|
|||||||
emu_nodist = symlist.c;
|
emu_nodist = symlist.c;
|
||||||
|
|
||||||
ldadd = 'kernel.img$(EXEEXT)';
|
ldadd = 'kernel.img$(EXEEXT)';
|
||||||
ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)';
|
ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
|
||||||
|
|
||||||
enable = emu;
|
enable = emu;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in new issue
Block a user