diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2018-09-05 23:38:26 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2018-09-05 23:38:26 -0400 |
| commit | bab479f78d08aaab25917e51f90b85e0ca5f42b4 (patch) | |
| tree | 7ed7fd44f6d90b59dc7d2501ea2eede9b772d227 | |
| parent | sys-kernel/ck-sources: genpatches-4.18-8 (diff) | |
| download | gentoo-bab479f78d08aaab25917e51f90b85e0ca5f42b4.tar.gz gentoo-bab479f78d08aaab25917e51f90b85e0ca5f42b4.tar.bz2 gentoo-bab479f78d08aaab25917e51f90b85e0ca5f42b4.zip | |
sys-boot/grub: fix build with gcc8
Closes: https://bugs.gentoo.org/662408
Package-Manager: Portage-2.3.49_p2, Repoman-2.3.10_p48
| -rw-r--r-- | sys-boot/grub/files/2.02-gcc8.patch | 72 | ||||
| -rw-r--r-- | sys-boot/grub/grub-2.02-r3.ebuild | 1 |
2 files changed, 73 insertions, 0 deletions
diff --git a/sys-boot/grub/files/2.02-gcc8.patch b/sys-boot/grub/files/2.02-gcc8.patch new file mode 100644 index 000000000000..51ee7dc86c25 --- /dev/null +++ b/sys-boot/grub/files/2.02-gcc8.patch @@ -0,0 +1,72 @@ +From 563b1da6e6ae7af46cc8354cadb5dab416989f0a Mon Sep 17 00:00:00 2001 +From: Michael Chang <mchang@suse.com> +Date: Mon, 26 Mar 2018 16:52:34 +0800 +Subject: Fix packed-not-aligned error on GCC 8 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When building with GCC 8, there are several errors regarding packed-not-aligned. + +./include/grub/gpt_partition.h:79:1: error: alignment 1 of ‘struct grub_gpt_partentry’ is less than 8 [-Werror=packed-not-aligned] + +This patch fixes the build error by cleaning up the ambiguity of placing +aligned structure in a packed one. In "struct grub_btrfs_time" and "struct +grub_gpt_part_type", the aligned attribute seems to be superfluous, and also +has to be packed, to ensure the structure is bit-to-bit mapped to the format +laid on disk. I think we could blame to copy and paste error here for the +mistake. In "struct efi_variable", we have to use grub_efi_packed_guid_t, as +the name suggests. :) + +Signed-off-by: Michael Chang <mchang@suse.com> +Tested-by: Michael Chang <mchang@suse.com> +Tested-by: Paul Menzel <paulepanter@users.sourceforge.net> +Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> +--- + grub-core/fs/btrfs.c | 2 +- + include/grub/efiemu/runtime.h | 2 +- + include/grub/gpt_partition.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c +index 4849c1c..be19544 100644 +--- a/grub-core/fs/btrfs.c ++++ b/grub-core/fs/btrfs.c +@@ -175,7 +175,7 @@ struct grub_btrfs_time + { + grub_int64_t sec; + grub_uint32_t nanosec; +-} __attribute__ ((aligned (4))); ++} GRUB_PACKED; + + struct grub_btrfs_inode + { +diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h +index 9b6b729..36d2ded 100644 +--- a/include/grub/efiemu/runtime.h ++++ b/include/grub/efiemu/runtime.h +@@ -29,7 +29,7 @@ struct grub_efiemu_ptv_rel + + struct efi_variable + { +- grub_efi_guid_t guid; ++ grub_efi_packed_guid_t guid; + grub_uint32_t namelen; + grub_uint32_t size; + grub_efi_uint32_t attributes; +diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h +index 1b32f67..9668a68 100644 +--- a/include/grub/gpt_partition.h ++++ b/include/grub/gpt_partition.h +@@ -28,7 +28,7 @@ struct grub_gpt_part_type + grub_uint16_t data2; + grub_uint16_t data3; + grub_uint8_t data4[8]; +-} __attribute__ ((aligned(8))); ++} GRUB_PACKED; + typedef struct grub_gpt_part_type grub_gpt_part_type_t; + + #define GRUB_GPT_PARTITION_TYPE_EMPTY \ +-- +cgit v1.0-41-gc330 + diff --git a/sys-boot/grub/grub-2.02-r3.ebuild b/sys-boot/grub/grub-2.02-r3.ebuild index d4640dd767bc..a27127851957 100644 --- a/sys-boot/grub/grub-2.02-r3.ebuild +++ b/sys-boot/grub/grub-2.02-r3.ebuild @@ -43,6 +43,7 @@ PATCHES=( "${FILESDIR}"/2.02-freetype-pkg-config.patch "${FILESDIR}"/2.02-xfs-sparse-inodes.patch "${FILESDIR}"/2.02-X86_64_PLT32.patch + "${FILESDIR}"/2.02-gcc8.patch ) DEJAVU=dejavu-sans-ttf-2.37 |