[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-libexec/

[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-libexec/

[Michał Górny]

commit:     af4a98f9d64537dba6f7db310806e4393720a4b6
Author:     Yuta Satoh <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Sat Jan 30 07:38:35 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 07:38:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af4a98f9

sys-freebsd/freebsd-libexec: Add a workaround for gcc-5.0 or later.

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=573358

 sys-freebsd/freebsd-libexec/freebsd-libexec-10.2.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.2.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.2.ebuild
index cf509b2..89c29a0 100644
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.2.ebuild
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit bsdmk freebsd pam multilib multibuild multilib-build
+inherit bsdmk freebsd pam multilib multibuild multilib-build toolchain-funcs
 
 DESCRIPTION="FreeBSD libexec things"
 SLOT="0"
@@ -53,6 +53,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# gcc-5.0 or later, Workaround for critical issue. bug 573358.
+	[[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O[2-9] -O1
+
 	if [[ ! -e "${WORKDIR}/include" ]]; then
 		ln -s /usr/include "${WORKDIR}/include" || die "Symlinking /usr/include.."
 	fi

[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-libexec/

[Patrice Clement]

commit:     7c1b45db1cc33fdfb2d018e46d1f1a5afb5378b2
Author:     Yuta Satoh <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Mon Aug 15 12:23:22 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 20:55:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c1b45db

sys-freebsd/freebsd-libexec: Added some define for upgrade.

Closes: https://github.com/gentoo/gentoo/pull/2083

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild
index 84eb839..26851c8 100644
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild
@@ -72,6 +72,9 @@ src_prepare() {
 		# taken from sys/sys/cdefs.h
 		echo '#define __compiler_membar()  __asm __volatile(" " : : : "memory")' >> "${S}"/rtld-elf/rtld.h
 		# taken from sys/sys/mman.h
+		echo '#define MAP_ALIGNED(n) ((n) << MAP_ALIGNMENT_SHIFT)' >> "${S}"/rtld-elf/rtld.h
+		echo '#define MAP_ALIGNMENT_SHIFT 24' >> "${S}"/rtld-elf/rtld.h
+		echo '#define MAP_ALIGNMENT_MASK MAP_ALIGNED(0xff)' >> "${S}"/rtld-elf/rtld.h
 		echo '#define MAP_ALIGNED_SUPER MAP_ALIGNED(1)' >> "${S}"/rtld-elf/rtld.h
 	fi
 }