diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2014-09-09 19:55:14 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2014-09-09 19:55:14 +0000 |
| commit | 6dd53f07eac024c38f772d799634ecf588cf14f3 (patch) | |
| tree | a2000b0c456a83030f67beba39312e55f282ecc9 /sys-boot/grub/files | |
| parent | arm stable, bug #503570 (diff) | |
| download | historical-6dd53f07eac024c38f772d799634ecf588cf14f3.tar.gz historical-6dd53f07eac024c38f772d799634ecf588cf14f3.tar.bz2 historical-6dd53f07eac024c38f772d799634ecf588cf14f3.zip | |
Backport build fix for when both device-mapper and libzfs are enabled. Bug 496608.
Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'sys-boot/grub/files')
| -rw-r--r-- | sys-boot/grub/files/grub-2.02_beta2-libzfs.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/sys-boot/grub/files/grub-2.02_beta2-libzfs.patch b/sys-boot/grub/files/grub-2.02_beta2-libzfs.patch new file mode 100644 index 000000000000..d76a903c862b --- /dev/null +++ b/sys-boot/grub/files/grub-2.02_beta2-libzfs.patch @@ -0,0 +1,19 @@ +commit 6ba983559dcffa0fa69c7fc861b5a16b4877a92c +Author: Mike Gilbert <floppym@gentoo.org> +Date: Sat Jan 18 19:41:15 2014 +0100 + + * Makefile.util.def: Link grub-ofpathname with zfs libs. + +diff --git a/Makefile.util.def b/Makefile.util.def +index 83df212..a286a89 100644 +--- a/Makefile.util.def ++++ b/Makefile.util.def +@@ -384,7 +384,7 @@ program = { + ldadd = libgrubgcry.a; + ldadd = libgrubkern.a; + ldadd = grub-core/gnulib/libgnu.a; +- ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBGEOM)'; ++ ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)'; + }; + + program = { |