From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: "Michał Górny" <mgorny@gentoo.org>
Subject: [gentoo-dev] [PATCH 6/8] profiles: Inline features/multilib/lib32
Date: Sat, 21 Jan 2017 23:59:45 +0100 [thread overview]
Message-ID: <20170121225947.11433-7-mgorny@gentoo.org> (raw)
In-Reply-To: <20170121225947.11433-1-mgorny@gentoo.org>
NFC except for effective LIBDIR_* for architectures irrelevant to
the profile at hand.
---
profiles/arch/amd64-fbsd/make.defaults | 3 ++-
profiles/arch/amd64-fbsd/parent | 2 +-
profiles/arch/amd64/make.defaults | 6 +++++-
profiles/arch/amd64/parent | 2 +-
.../default/linux/sparc/experimental/multilib/make.defaults | 4 +++-
profiles/default/linux/sparc/experimental/multilib/parent | 2 +-
profiles/features/multilib/lib32/eapi | 1 -
profiles/features/multilib/lib32/make.defaults | 13 -------------
profiles/features/multilib/lib32/parent | 1 -
9 files changed, 13 insertions(+), 21 deletions(-)
delete mode 100644 profiles/features/multilib/lib32/eapi
delete mode 100644 profiles/features/multilib/lib32/make.defaults
delete mode 100644 profiles/features/multilib/lib32/parent
diff --git a/profiles/arch/amd64-fbsd/make.defaults b/profiles/arch/amd64-fbsd/make.defaults
index 42329af60819..b2170df430f0 100644
--- a/profiles/arch/amd64-fbsd/make.defaults
+++ b/profiles/arch/amd64-fbsd/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation.
+# Copyright 1999-2017 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
# $Id$
# System-wide defaults for the G/FBSD Portage system
@@ -32,6 +32,7 @@ VIDEO_CARDS="apm ark chips cirrus cyrix dummy i128 intel mach64 mga \
# distros.
# Adjust multilib dirs for multilib-strict.
LIBDIR_amd64_fbsd="lib"
+LIBDIR_x86_fbsd="lib32"
MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X11R6/lib32"
SYMLINK_LIB="no"
diff --git a/profiles/arch/amd64-fbsd/parent b/profiles/arch/amd64-fbsd/parent
index db3aa68cdfc0..014611b2535c 100644
--- a/profiles/arch/amd64-fbsd/parent
+++ b/profiles/arch/amd64-fbsd/parent
@@ -1,3 +1,3 @@
../base
-../../features/multilib/lib32
+../../features/multilib
todo
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 96a6803f351a..0049d67bce78 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,6 +18,10 @@ DEFAULT_ABI="amd64"
# Do not remove this one, or all kinds of hell breaks loose.
ABI="amd64"
+# TODO: move this to a deprecated subprofile
+LIBDIR_x86="lib32"
+SYMLINK_LIB="yes"
+
# 64bit specific settings.
CFLAGS_amd64="-m64"
LDFLAGS_amd64="-m elf_x86_64"
diff --git a/profiles/arch/amd64/parent b/profiles/arch/amd64/parent
index d8d1efff8456..c5b66f7e9c9c 100644
--- a/profiles/arch/amd64/parent
+++ b/profiles/arch/amd64/parent
@@ -1,2 +1,2 @@
../base
-../../features/multilib/lib32
+../../features/multilib
diff --git a/profiles/default/linux/sparc/experimental/multilib/make.defaults b/profiles/default/linux/sparc/experimental/multilib/make.defaults
index e7aebfdaa360..c8bad628fd9a 100644
--- a/profiles/default/linux/sparc/experimental/multilib/make.defaults
+++ b/profiles/default/linux/sparc/experimental/multilib/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,3 +11,5 @@ FEATURES="userpriv"
# can't set this in the top level make.defaults as it breaks
# sys-kernel/linux-headers for non-multilib profiles
CFLAGS_sparc64="-m64"
+
+LIBDIR_sparc32="lib32"
diff --git a/profiles/default/linux/sparc/experimental/multilib/parent b/profiles/default/linux/sparc/experimental/multilib/parent
index 7607023366ad..04ec01cf0979 100644
--- a/profiles/default/linux/sparc/experimental/multilib/parent
+++ b/profiles/default/linux/sparc/experimental/multilib/parent
@@ -1,3 +1,3 @@
..
../../../../../releases/13.0
-../../../../../features/multilib/lib32
+../../../../../features/multilib
diff --git a/profiles/features/multilib/lib32/eapi b/profiles/features/multilib/lib32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/features/multilib/lib32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/features/multilib/lib32/make.defaults b/profiles/features/multilib/lib32/make.defaults
deleted file mode 100644
index b3ab33c98e43..000000000000
--- a/profiles/features/multilib/lib32/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Let baselayout create the lib symlink.
-SYMLINK_LIB="yes"
-
-# 32-bit LIBDIR
-LIBDIR_ppc="lib32"
-LIBDIR_x86="lib32"
-LIBDIR_x86_fbsd="lib32"
-LIBDIR_sparc32="lib32"
-LIBDIR_s390="lib32"
diff --git a/profiles/features/multilib/lib32/parent b/profiles/features/multilib/lib32/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/features/multilib/lib32/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
--
2.11.0
next prev parent reply other threads:[~2017-01-21 23:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-21 22:59 [gentoo-dev] [PATCH] Profile cleanup, pt. 2: multilib mess Michał Górny
2017-01-21 22:59 ` [gentoo-dev] [PATCH 1/8] profiles/hardened: Include base amd64-multilib profile in subprofile Michał Górny
2017-03-02 14:09 ` [gentoo-dev] profiles/arch/amd64/no-multilib cleanup WAS: " Michael Haubenwallner
2017-03-02 16:40 ` Michał Górny
2017-01-21 22:59 ` [gentoo-dev] [PATCH 2/8] profiles: Move amd64-specific masks to amd64 where they belong Michał Górny
2017-01-21 22:59 ` [gentoo-dev] [PATCH 3/8] profiles/*/amd64/*/no-multilib: stop using features/64bit-native Michał Górny
2017-01-21 22:59 ` [gentoo-dev] [PATCH 4/8] profiles/*/ppc64: " Michał Górny
2017-01-21 22:59 ` [gentoo-dev] [PATCH 5/8] profiles/features: Remove unused *bit-native Michał Górny
2017-01-21 22:59 ` Michał Górny [this message]
2017-01-21 22:59 ` [gentoo-dev] [PATCH 7/8] profiles: Inline features/32bit-userland Michał Górny
2017-01-21 22:59 ` [gentoo-dev] [PATCH 8/8] profiles: Move LIBDIR_* declarations into specific arches Michał Górny
2017-02-01 12:28 ` [gentoo-dev] [PATCH] Profile cleanup, pt. 2: multilib mess Michał Górny
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=20170121225947.11433-7-mgorny@gentoo.org \
--to=mgorny@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