[arch-commits] Commit in grub/trunk (2 files)
Christian Hesse
eworm at archlinux.org
Mon May 7 22:31:54 UTC 2018
Date: Monday, May 7, 2018 @ 22:31:53
Author: eworm
Revision: 323464
more freetype fixes, build with GCC 8.x
Added:
grub/trunk/0008-Fix-packed-not-aligned-error-on-GCC-8.patch
Modified:
grub/trunk/PKGBUILD
--------------------------------------------------+
0008-Fix-packed-not-aligned-error-on-GCC-8.patch | 72 +++++++++++++++++++++
PKGBUILD | 7 ++
2 files changed, 79 insertions(+)
Added: 0008-Fix-packed-not-aligned-error-on-GCC-8.patch
===================================================================
--- 0008-Fix-packed-not-aligned-error-on-GCC-8.patch (rev 0)
+++ 0008-Fix-packed-not-aligned-error-on-GCC-8.patch 2018-05-07 22:31:53 UTC (rev 323464)
@@ -0,0 +1,72 @@
+From 563b1da6e6ae7af46cc8354cadb5dab416989f0a Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang at 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 at suse.com>
+Tested-by: Michael Chang <mchang at suse.com>
+Tested-by: Paul Menzel <paulepanter at users.sourceforge.net>
+Reviewed-by: Daniel Kiper <daniel.kiper at 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 4849c1ceb..be195448d 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 9b6b729f4..36d2dedf4 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 1b32f6725..9668a68c3 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.1-33-g03f6
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-07 22:16:03 UTC (rev 323463)
+++ PKGBUILD 2018-05-07 22:31:53 UTC (rev 323464)
@@ -65,6 +65,7 @@
'0005-Allow_GRUB_to_mount_ext234_filesystems_that_have_the_encryption_feature.patch'
'0006-tsc-Change-default-tsc-calibration-method-to-pmtimer-on-EFI-systems.patch'
'0007-grub-mkconfig_10_linux_Support_multiple_early_initrd_images.patch'
+ '0008-Fix-packed-not-aligned-error-on-GCC-8.patch'
'grub.default'
'grub.cfg')
@@ -78,6 +79,7 @@
'535422c510a050d41efe7720dbe54de29e04bdb8f86fd5aea5feb0b24f7abe46'
'c38f2b2caae33008b35a37d8293d8bf13bf6fd779a4504925da1837fd007aeb5'
'e43566c4fe3b1b87e677167323d4716b82ac0810410a9d8dc7fbf415c8db2b8a'
+ 'e84b8de569c7e6b73263758c35cf95c6516fde85d4ed451991427864f6a4e5a8'
'74e5dd2090a153c10a7b9599b73bb09e70fddc6a019dd41641b0f10b9d773d82'
'c5e4f3836130c6885e9273c21f057263eba53f4b7c0e2f111f6e5f2e487a47ad')
@@ -104,6 +106,9 @@
msg "Support multiple early initrd images"
patch -Np1 -i "${srcdir}/0007-grub-mkconfig_10_linux_Support_multiple_early_initrd_images.patch"
+ msg "Fix packed-not-aligned error on GCC 8"
+ patch -Np1 -i "${srcdir}/0008-Fix-packed-not-aligned-error-on-GCC-8.patch"
+
msg "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme"
sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
@@ -204,6 +209,7 @@
msg "Run ./configure for ${_EFI_ARCH} efi build"
./configure \
+ FREETYPE="pkg-config freetype2" \
--with-platform="efi" \
--target="${_EFI_ARCH}" \
--disable-efiemu \
@@ -251,6 +257,7 @@
msg "Run ./configure for emu build"
./configure \
+ FREETYPE="pkg-config freetype2" \
--with-platform="emu" \
--target="${_EMU_ARCH}" \
--enable-mm-debug \
More information about the arch-commits
mailing list