commit:     9bf960c92f48961d4e81ab0bdf7b7b20d9f65ae6
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  8 19:52:42 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 19:55:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf960c9

profiles/prefix/darwin/macos: mask USE=pie default-znow where appropriate

-z,now doesn't work with Darwin linkers
pie mode doesn't work on PowerPC (where we find -mdynamic-no-pic code)

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 profiles/prefix/darwin/macos/arch/ppc/package.use.force | 6 +++++-
 profiles/prefix/darwin/macos/arch/ppc/package.use.mask  | 5 ++++-
 profiles/prefix/darwin/macos/package.use.force          | 6 +++++-
 profiles/prefix/darwin/macos/package.use.mask           | 6 +++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.use.force 
b/profiles/prefix/darwin/macos/arch/ppc/package.use.force
index 6a8082838a01..8b8c4b921435 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.use.force
@@ -1,6 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <[email protected]> (2024-03-08)
+# un-force pie, won't work on this arch
+sys-devel/gcc -pie
+
 # Fabian Groffen <[email protected]> (2016-12-20)
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_PowerPC

diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.use.mask 
b/profiles/prefix/darwin/macos/arch/ppc/package.use.mask
index 9c83518aa275..49efca95022e 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.use.mask
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.use.mask
@@ -1,9 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # The 32-bits profile is inherited by the 64-bits one!
 # All the Mac OS X profiles inherit from their matching arch profile here.
 
+# Fabian Groffen <[email protected]> (2024-03-08)
+# mask pie, won't work on this arch
+sys-devel/gcc pie
 
 # Elias Pipping <[email protected]> (2007-09-01)
 # imlib2 does not compile with USE=mmx

diff --git a/profiles/prefix/darwin/macos/package.use.force 
b/profiles/prefix/darwin/macos/package.use.force
index 12147203082c..e5acd2f939e7 100644
--- a/profiles/prefix/darwin/macos/package.use.force
+++ b/profiles/prefix/darwin/macos/package.use.force
@@ -1,6 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <[email protected]> (2024-03-08)
+# -z,now is not something Darwin linkers understand
+sys-devel/gcc -default-znow
+
 # Jacob Floyd <[email protected]> (2020-12-20)
 # Make sure we always use libcxxabi on macos prefix
 sys-libs/libcxx libcxxabi

diff --git a/profiles/prefix/darwin/macos/package.use.mask 
b/profiles/prefix/darwin/macos/package.use.mask
index fb4617ec5e85..752f5b30f15f 100644
--- a/profiles/prefix/darwin/macos/package.use.mask
+++ b/profiles/prefix/darwin/macos/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <[email protected]> (2024-03-08)
+# -z,now is not something Darwin linkers understand
+sys-devel/gcc default-znow
+
 # Benda Xu <[email protected]> (2023-08-18)
 # strlcpy and other BSD functions are available in the libc of macOS.
 # Should not use libbsd.

Reply via email to