[gentoo-dev] [PATCH] profiles/features/hardened/amd64: enable USE=pic

[gentoo-dev] [PATCH] profiles/features/hardened/amd64: enable USE=pic

[Sam James]

There's no real reason not to do this. The status quo is wrong for when
we're doing multilib 32-bit builds on x86, and we already have to undo
this on musl because its handling for TEXTRELs is limited (see bug #707660).

(I noted my intention to do this in 80a72bac2350811712c018b68f61a031736c579f
as well.)

This seems to have been added originally in e718e1dc1781b3bb5cd80233c217aea3b0e46755
and bb28d08f1cf8cf16f6e57929a8de6b7c85bbe714 (git graft commit).

Bug: https://bugs.gentoo.org/707660
Bug: https://bugs.gentoo.org/913412
Signed-off-by: Sam James <sam@gentoo.org>
---
 profiles/features/hardened/amd64/make.defaults             | 2 +-
 profiles/features/hardened/amd64/no-multilib/make.defaults | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 profiles/features/hardened/amd64/no-multilib/make.defaults

diff --git a/profiles/features/hardened/amd64/make.defaults b/profiles/features/hardened/amd64/make.defaults
index e8f0bdf8ba650..89a7242c35648 100644
--- a/profiles/features/hardened/amd64/make.defaults
+++ b/profiles/features/hardened/amd64/make.defaults
@@ -1,4 +1,4 @@
 # Copyright 1999-2023 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
-USE="cet -pic"
+USE="cet"
diff --git a/profiles/features/hardened/amd64/no-multilib/make.defaults b/profiles/features/hardened/amd64/no-multilib/make.defaults
deleted file mode 100644
index 1dd0a2a0f7e0d..0000000000000
--- a/profiles/features/hardened/amd64/no-multilib/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# We don't need to have pic on
-USE="-pic"
-
-- 
2.43.0

Re: [gentoo-dev] [PATCH] profiles/features/hardened/amd64: enable USE=pic

[David Seifert]

On Sat, 2023-11-25 at 06:55 +0000, Sam James wrote:
> There's no real reason not to do this. The status quo is wrong for
> when
> we're doing multilib 32-bit builds on x86, and we already have to undo
> this on musl because its handling for TEXTRELs is limited (see bug
> #707660).
> 
> (I noted my intention to do this in
> 80a72bac2350811712c018b68f61a031736c579f
> as well.)
> 
> This seems to have been added originally in
> e718e1dc1781b3bb5cd80233c217aea3b0e46755
> and bb28d08f1cf8cf16f6e57929a8de6b7c85bbe714 (git graft commit).
> 
> Bug: https://bugs.gentoo.org/707660
> Bug: https://bugs.gentoo.org/913412
> Signed-off-by: Sam James <sam@gentoo.org>
> ---
>  profiles/features/hardened/amd64/make.defaults             | 2 +-
>  profiles/features/hardened/amd64/no-multilib/make.defaults | 6 ------
>  2 files changed, 1 insertion(+), 7 deletions(-)
>  delete mode 100644 profiles/features/hardened/amd64/no-
> multilib/make.defaults
> 
> diff --git a/profiles/features/hardened/amd64/make.defaults
> b/profiles/features/hardened/amd64/make.defaults
> index e8f0bdf8ba650..89a7242c35648 100644
> --- a/profiles/features/hardened/amd64/make.defaults
> +++ b/profiles/features/hardened/amd64/make.defaults
> @@ -1,4 +1,4 @@
>  # Copyright 1999-2023 Gentoo Authors.
>  # Distributed under the terms of the GNU General Public License v2
>  
> -USE="cet -pic"
> +USE="cet"
> diff --git a/profiles/features/hardened/amd64/no-
> multilib/make.defaults b/profiles/features/hardened/amd64/no-
> multilib/make.defaults
> deleted file mode 100644
> index 1dd0a2a0f7e0d..0000000000000
> --- a/profiles/features/hardened/amd64/no-multilib/make.defaults
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -# Copyright 1999-2011 Gentoo Foundation
> -# Distributed under the terms of the GNU General Public License v2
> -
> -# We don't need to have pic on
> -USE="-pic"
> -

LGTM