Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/sparc/17.0/, profiles/arch/sparc/
Date: Mon, 26 Aug 2019 15:30:29
Message-Id: 1566833411.46819eabbee23cee91ef5c025b0d2bd8b8c43f96.mattst88@gentoo
1 commit: 46819eabbee23cee91ef5c025b0d2bd8b8c43f96
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 25 23:52:01 2019 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 26 15:30:11 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46819eab
7
8 profiles/sparc: Move LIBDIR assignments
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 profiles/arch/sparc/make.defaults | 3 +++
13 profiles/default/linux/sparc/17.0/make.defaults | 7 -------
14 2 files changed, 3 insertions(+), 7 deletions(-)
15
16 diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
17 index 66fd2ca7a08..d78ba38801a 100644
18 --- a/profiles/arch/sparc/make.defaults
19 +++ b/profiles/arch/sparc/make.defaults
20 @@ -27,6 +27,9 @@ CTARGET_sparc32="sparc-unknown-linux-gnu"
21 # do NOT set CFLAGS_sparc64 here it'd break linux-headers for non-multilib
22 # profiles
23
24 +LIBDIR_sparc32="lib"
25 +LIBDIR_sparc64="lib64"
26 +
27 # Compiler flags
28 CFLAGS="-O2 -mcpu=ultrasparc -pipe"
29 CXXFLAGS="${CFLAGS}"
30
31 diff --git a/profiles/default/linux/sparc/17.0/make.defaults b/profiles/default/linux/sparc/17.0/make.defaults
32 deleted file mode 100644
33 index 15095e86283..00000000000
34 --- a/profiles/default/linux/sparc/17.0/make.defaults
35 +++ /dev/null
36 @@ -1,7 +0,0 @@
37 -# Copyright 1999-2017 Gentoo Foundation
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -# LIBDIR_* moved from features/multilib, #609178.
41 -# TODO: figure out whether this can be moved to arch/sparc
42 -LIBDIR_sparc32="lib"
43 -LIBDIR_sparc64="lib64"