From: "Magnus Granberg" <zorry@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/, sys-boot/grub/files/
Date: Sat, 21 May 2016 18:19:10 +0000 (UTC) [thread overview]
Message-ID: <1463853552.2e55308331d26b93a2dd2a0b6be1760db27e40d4.zorry@gentoo> (raw)
commit: 2e55308331d26b93a2dd2a0b6be1760db27e40d4
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 17:57:34 2016 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat May 21 17:59:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e553083
sys-boot/grub-2.02_beta3 Add fix for gcc-6.1.0[pie] #583042
Package-Manager: portage-2.2.27
.../grub/files/2.02_beta3-gcc6-ld-no-pie.patch | 57 ++++++++++++++++++++++
sys-boot/grub/grub-2.02_beta3-r1.ebuild | 1 +
2 files changed, 58 insertions(+)
diff --git a/sys-boot/grub/files/2.02_beta3-gcc6-ld-no-pie.patch b/sys-boot/grub/files/2.02_beta3-gcc6-ld-no-pie.patch
new file mode 100644
index 0000000..0d81415
--- /dev/null
+++ b/sys-boot/grub/files/2.02_beta3-gcc6-ld-no-pie.patch
@@ -0,0 +1,57 @@
+2016-05-21 Magnus Granberg <zorry@gentoo.org>
+
+ #583042 sys-boot/grub-2.02_beta3-r1: building w/gcc-6[pie]: error:
+ x86_64-pc-linux-gnu/bin/ld: -r and -shared may not be used together
+
+ * acinclude.m4: Add -no-pie check.
+ * configure.ac: Add -no-pie to TARGET_LDFLAGS if needed.
+
+--- a/acinclude.m4 2015-11-11 20:56:52.000000000 +0100
++++ b/acinclude.m4 2016-05-17 00:08:22.000000000 +0200
+@@ -390,6 +390,24 @@ else
+ [fi]
+ ])
+
++dnl Check if the Linker supports `-no-pie'.
++AC_DEFUN([grub_CHECK_NO_PIE],
++[AC_MSG_CHECKING([whether linker accepts -no-pie])
++AC_CACHE_VAL(grub_cv_cc_ld_nopie,
++[save_LDFLAGS="$LDFLAGS"
++LDFLAGS="$LDFLAGS -no-pie"
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
++ [grub_cv_cc_ld_no_pie=yes],
++ [grub_cv_cc_ld_no_pie=no])
++LDFLAGS="$save_LDFLAGS"
++])
++AC_MSG_RESULT([$grub_cv_cc_ld_no_pie])
++nopie_possible=no
++if test "x$grub_cv_cc_ld_no_pie" = xyes ; then
++ nopie_possible=yes
++fi
++])
++
+ dnl Check if the C compiler supports `-fPIC'.
+ AC_DEFUN([grub_CHECK_PIC],[
+ [# Position independent executable.
+--- a/configure.ac 2016-02-27 13:40:56.000000000 +0100
++++ b/configure.ac 2016-05-17 00:57:29.471000000 +0200
+@@ -1184,13 +1184,18 @@ CFLAGS="$TARGET_CFLAGS"
+
+ # Position independent executable.
+ grub_CHECK_PIE
++grub_CHECK_NO_PIE
+ [# Need that, because some distributions ship compilers that include
+-# `-fPIE' in the default specs.
++# `-fPIE' and '-pie' in the default specs.
+ if [ x"$pie_possible" = xyes ]; then
+ TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE"
++fi
++if [ x"$nopie_possible" = xyes ] && [ x"$pie_possible" = xyes ]; then
++ TARGET_LDFLAGS="$TARGET_LDFLAGS -no-pie"
+ fi]
+
+ CFLAGS="$TARGET_CFLAGS"
++LDFLAGS="$TARGET_LDFLAGS"
+
+ # Position independent executable.
+ grub_CHECK_PIC
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index ab05794..7fd67ee 100644
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -35,6 +35,7 @@ PATCHES=(
"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
"${FILESDIR}"/2.02_beta3-10_linux-UUID.patch
"${FILESDIR}"/2.02_beta3-sysmacros.patch
+ "${FILESDIR}"/2.02_beta3-gcc6-ld-no-pie.patch
)
DEJAVU=dejavu-sans-ttf-2.35
next reply other threads:[~2016-05-21 18:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-21 18:19 Magnus Granberg [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-22 18:09 [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/, sys-boot/grub/files/ Mike Gilbert
2024-04-11 19:40 Mike Gilbert
2023-07-11 14:25 Mike Gilbert
2023-05-09 20:23 Mike Gilbert
2023-02-13 16:47 Mike Gilbert
2023-01-17 16:03 Mike Gilbert
2023-01-17 16:03 Mike Gilbert
2022-09-16 23:10 Mike Gilbert
2021-09-07 17:28 Mike Gilbert
2021-03-14 18:36 Mike Gilbert
2020-03-15 18:34 Mike Gilbert
2019-07-23 13:21 Mike Gilbert
2019-06-24 18:34 Mike Gilbert
2018-09-01 22:07 Thomas Deutschmann
2018-06-26 14:45 Mike Gilbert
2018-05-04 16:28 Mike Gilbert
2018-04-01 18:18 Mike Gilbert
2016-10-05 14:22 Mike Gilbert
2016-04-24 15:30 Mike Gilbert
2016-03-05 22:36 Mike Gilbert
2015-12-15 18:30 Mike Gilbert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1463853552.2e55308331d26b93a2dd2a0b6be1760db27e40d4.zorry@gentoo \
--to=zorry@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox