[gentoo-dev] [PATCH 5/8] profiles/features: Remove unused *bit-native - gentoo-dev

From:	"Michał Górny" <mgorny@g.o>
To:	gentoo-dev@l.g.o
Cc:	"Michał Górny" <mgorny@g.o>
Subject:	*[gentoo-dev] [PATCH 5/8] profiles/features: Remove unused bit-native**
Date:	Sat, 21 Jan 2017 23:04:44
Message-Id:	`20170121225947.11433-6-mgorny@gentoo.org`
In Reply to:	[gentoo-dev] [PATCH] Profile cleanup, pt. 2: multilib mess by "Michał Górny"

1

---

2

 profiles/features/32bit-native/eapi           |  1 -

3

 profiles/features/32bit-native/make.defaults  |  9 ---------

4

 profiles/features/32bit-native/packages       |  6 ------

5

 profiles/features/32bit-native/profile.bashrc |  7 -------

6

 profiles/features/32bit-native/use.force      |  2 --

7

 profiles/features/32bit-native/use.mask       |  9 ---------

8

 profiles/features/64bit-native/eapi           |  1 -

9

 profiles/features/64bit-native/make.defaults  | 10 ----------

10

 profiles/features/64bit-native/profile.bashrc | 18 ------------------

11

 profiles/features/64bit-native/use.force      |  2 --

12

 profiles/features/64bit-native/use.mask       |  9 ---------

13

 11 files changed, 74 deletions(-)

14

 delete mode 100644 profiles/features/32bit-native/eapi

15

 delete mode 100644 profiles/features/32bit-native/make.defaults

16

 delete mode 100644 profiles/features/32bit-native/packages

17

 delete mode 100644 profiles/features/32bit-native/profile.bashrc

18

 delete mode 100644 profiles/features/32bit-native/use.force

19

 delete mode 100644 profiles/features/32bit-native/use.mask

20

 delete mode 100644 profiles/features/64bit-native/eapi

21

 delete mode 100644 profiles/features/64bit-native/make.defaults

22

 delete mode 100644 profiles/features/64bit-native/profile.bashrc

23

 delete mode 100644 profiles/features/64bit-native/use.force

24

 delete mode 100644 profiles/features/64bit-native/use.mask

25

26

diff --git a/profiles/features/32bit-native/eapi b/profiles/features/32bit-native/eapi

27

deleted file mode 100644

28

index 7ed6ff82de6b..000000000000

29

--- a/profiles/features/32bit-native/eapi

30

+++ /dev/null

31

@@ -1 +0,0 @@

32

-5

33

diff --git a/profiles/features/32bit-native/make.defaults b/profiles/features/32bit-native/make.defaults

34

deleted file mode 100644

35

index f23c882330fd..000000000000

36

--- a/profiles/features/32bit-native/make.defaults

37

+++ /dev/null

38

@@ -1,9 +0,0 @@

39

-# Copyright 1999-2017 Gentoo Foundation

40

-# Distributed under the terms of the GNU General Public License v2

41

-# $Id$

42

-

43

-FEATURES="-multilib-strict"

44

-

45

-MULTILIB_STRICT_DIRS=""

46

-MULTILIB_STRICT_DENY=""

47

-MULTILIB_STRICT_EXEMPT=""

48

diff --git a/profiles/features/32bit-native/packages b/profiles/features/32bit-native/packages

49

deleted file mode 100644

50

index 887f05da9931..000000000000

51

--- a/profiles/features/32bit-native/packages

52

+++ /dev/null

53

@@ -1,6 +0,0 @@

54

-# Copyright 2006-2008 Gentoo Foundation.

55

-# Distributed under the terms of the GNU General Public License v2

56

-# $Id$

57

-

58

-# We don't need kgcc64 to build kernels.

59

--*sys-devel/kgcc64

60

diff --git a/profiles/features/32bit-native/profile.bashrc b/profiles/features/32bit-native/profile.bashrc

61

deleted file mode 100644

62

index c601900384e3..000000000000

63

--- a/profiles/features/32bit-native/profile.bashrc

64

+++ /dev/null

65

@@ -1,7 +0,0 @@

66

-# Here we die on any arch that isn't 32-bit.

67

-case ${ARCH} in

68

-	amd64) die "This architecture always uses a 64-bit kernel. Please use an x86 profile!" ;;

69

-	mips) die "This architecture always uses a 64-bit kernel." ;;

70

-	ppc64) die "This architecture always uses a 64-bit kernel. Please use a ppc profile!" ;;

71

-	sparc) die "This architecture always uses a 64-bit kernel." ;;

72

-esac

73

diff --git a/profiles/features/32bit-native/use.force b/profiles/features/32bit-native/use.force

74

deleted file mode 100644

75

index 78a0ced5d86d..000000000000

76

--- a/profiles/features/32bit-native/use.force

77

+++ /dev/null

78

@@ -1,2 +0,0 @@

79

-# Force disable multilib USE flag

80

--multilib

81

diff --git a/profiles/features/32bit-native/use.mask b/profiles/features/32bit-native/use.mask

82

deleted file mode 100644

83

index f5d4435fdbce..000000000000

84

--- a/profiles/features/32bit-native/use.mask

85

+++ /dev/null

86

@@ -1,9 +0,0 @@

87

-# Copyright 2004-2008 Gentoo Foundation.

88

-# Distributed under the terms of the GNU General Public License, v2

89

-# $Id$

90

-

91

-# SECTION: Mask

92

-

93

-# 2008/02/13 - Chris Gianelloni <wolf31o2@g.o>

94

-# Mask multilib, since we cannot use it.

95

-multilib

96

diff --git a/profiles/features/64bit-native/eapi b/profiles/features/64bit-native/eapi

97

deleted file mode 100644

98

index 7ed6ff82de6b..000000000000

99

--- a/profiles/features/64bit-native/eapi

100

+++ /dev/null

101

@@ -1 +0,0 @@

102

-5

103

diff --git a/profiles/features/64bit-native/make.defaults b/profiles/features/64bit-native/make.defaults

104

deleted file mode 100644

105

index 550c923fea54..000000000000

106

--- a/profiles/features/64bit-native/make.defaults

107

+++ /dev/null

108

@@ -1,10 +0,0 @@

109

-# Copyright 1999-2017 Gentoo Foundation

110

-# Distributed under the terms of the GNU General Public License v2

111

-# $Id$

112

-

113

-# We disable the symlink, since we won't be using it.

114

-SYMLINK_LIB="yes"

115

-

116

-# Since we're doing a pure 64-bit, we want LIBDIR to be lib64

117

-LIBDIR_amd64="lib64"

118

-LIBDIR_ppc64="lib64"

119

diff --git a/profiles/features/64bit-native/profile.bashrc b/profiles/features/64bit-native/profile.bashrc

120

deleted file mode 100644

121

index 71acdf820a05..000000000000

122

--- a/profiles/features/64bit-native/profile.bashrc

123

+++ /dev/null

124

@@ -1,18 +0,0 @@

125

-# Here we remove any ABI that isn't native.

126

-case ${ARCH} in

127

-	mips)

128

-		# Both n32 and n64 are 64-bit kernel and userland.

129

-		# n64 is 64-bit pointers/long

130

-		# n32 is 32-bit pointers/long

131

-		case ${USE} in

132

-			n32)

133

-				export CFLAGS="${CFLAGS/-mabi=*/-mabi=n32}"

134

-				export CXXFLAGS="${CFLAGS}"

135

-				;;

136

-			n64)

137

-				export CFLAGS="${CFLAGS/-mabi=*/-mabi=64}"

138

-				export CXXFLAGS="${CFLAGS}"

139

-				;;

140

-		esac

141

-		;;

142

-esac

143

diff --git a/profiles/features/64bit-native/use.force b/profiles/features/64bit-native/use.force

144

deleted file mode 100644

145

index 78a0ced5d86d..000000000000

146

--- a/profiles/features/64bit-native/use.force

147

+++ /dev/null

148

@@ -1,2 +0,0 @@

149

-# Force disable multilib USE flag

150

--multilib

151

diff --git a/profiles/features/64bit-native/use.mask b/profiles/features/64bit-native/use.mask

152

deleted file mode 100644

153

index 25c245751fb4..000000000000

154

--- a/profiles/features/64bit-native/use.mask

155

+++ /dev/null

156

@@ -1,9 +0,0 @@

157

-# Copyright 1999-2017 Gentoo Foundation

158

-# Distributed under the terms of the GNU General Public License v2

159

-# $Id$

160

-

161

-# USE flags masked because providing packages require a 32-bit ABI

162

-

163

-# 2008/02/13 - Chris Gianelloni <wolf31o2@g.o>

164

-# Mask multilib, since we cannot use it.

165

-multilib

166

--

167

2.11.0

1	---
2	profiles/features/32bit-native/eapi \| 1 -
3	profiles/features/32bit-native/make.defaults \| 9 ---------
4	profiles/features/32bit-native/packages \| 6 ------
5	profiles/features/32bit-native/profile.bashrc \| 7 -------
6	profiles/features/32bit-native/use.force \| 2 --
7	profiles/features/32bit-native/use.mask \| 9 ---------
8	profiles/features/64bit-native/eapi \| 1 -
9	profiles/features/64bit-native/make.defaults \| 10 ----------
10	profiles/features/64bit-native/profile.bashrc \| 18 ------------------
11	profiles/features/64bit-native/use.force \| 2 --
12	profiles/features/64bit-native/use.mask \| 9 ---------
13	11 files changed, 74 deletions(-)
14	delete mode 100644 profiles/features/32bit-native/eapi
15	delete mode 100644 profiles/features/32bit-native/make.defaults
16	delete mode 100644 profiles/features/32bit-native/packages
17	delete mode 100644 profiles/features/32bit-native/profile.bashrc
18	delete mode 100644 profiles/features/32bit-native/use.force
19	delete mode 100644 profiles/features/32bit-native/use.mask
20	delete mode 100644 profiles/features/64bit-native/eapi
21	delete mode 100644 profiles/features/64bit-native/make.defaults
22	delete mode 100644 profiles/features/64bit-native/profile.bashrc
23	delete mode 100644 profiles/features/64bit-native/use.force
24	delete mode 100644 profiles/features/64bit-native/use.mask
25
26	diff --git a/profiles/features/32bit-native/eapi b/profiles/features/32bit-native/eapi
27	deleted file mode 100644
28	index 7ed6ff82de6b..000000000000
29	--- a/profiles/features/32bit-native/eapi
30	+++ /dev/null
31	@@ -1 +0,0 @@
32	-5
33	diff --git a/profiles/features/32bit-native/make.defaults b/profiles/features/32bit-native/make.defaults
34	deleted file mode 100644
35	index f23c882330fd..000000000000
36	--- a/profiles/features/32bit-native/make.defaults
37	+++ /dev/null
38	@@ -1,9 +0,0 @@
39	-# Copyright 1999-2017 Gentoo Foundation
40	-# Distributed under the terms of the GNU General Public License v2
41	-# $Id$
42	-
43	-FEATURES="-multilib-strict"
44	-
45	-MULTILIB_STRICT_DIRS=""
46	-MULTILIB_STRICT_DENY=""
47	-MULTILIB_STRICT_EXEMPT=""
48	diff --git a/profiles/features/32bit-native/packages b/profiles/features/32bit-native/packages
49	deleted file mode 100644
50	index 887f05da9931..000000000000
51	--- a/profiles/features/32bit-native/packages
52	+++ /dev/null
53	@@ -1,6 +0,0 @@
54	-# Copyright 2006-2008 Gentoo Foundation.
55	-# Distributed under the terms of the GNU General Public License v2
56	-# $Id$
57	-
58	-# We don't need kgcc64 to build kernels.
59	--*sys-devel/kgcc64
60	diff --git a/profiles/features/32bit-native/profile.bashrc b/profiles/features/32bit-native/profile.bashrc
61	deleted file mode 100644
62	index c601900384e3..000000000000
63	--- a/profiles/features/32bit-native/profile.bashrc
64	+++ /dev/null
65	@@ -1,7 +0,0 @@
66	-# Here we die on any arch that isn't 32-bit.
67	-case ${ARCH} in
68	- amd64) die "This architecture always uses a 64-bit kernel. Please use an x86 profile!" ;;
69	- mips) die "This architecture always uses a 64-bit kernel." ;;
70	- ppc64) die "This architecture always uses a 64-bit kernel. Please use a ppc profile!" ;;
71	- sparc) die "This architecture always uses a 64-bit kernel." ;;
72	-esac
73	diff --git a/profiles/features/32bit-native/use.force b/profiles/features/32bit-native/use.force
74	deleted file mode 100644
75	index 78a0ced5d86d..000000000000
76	--- a/profiles/features/32bit-native/use.force
77	+++ /dev/null
78	@@ -1,2 +0,0 @@
79	-# Force disable multilib USE flag
80	--multilib
81	diff --git a/profiles/features/32bit-native/use.mask b/profiles/features/32bit-native/use.mask
82	deleted file mode 100644
83	index f5d4435fdbce..000000000000
84	--- a/profiles/features/32bit-native/use.mask
85	+++ /dev/null
86	@@ -1,9 +0,0 @@
87	-# Copyright 2004-2008 Gentoo Foundation.
88	-# Distributed under the terms of the GNU General Public License, v2
89	-# $Id$
90	-
91	-# SECTION: Mask
92	-
93	-# 2008/02/13 - Chris Gianelloni <wolf31o2@g.o>
94	-# Mask multilib, since we cannot use it.
95	-multilib
96	diff --git a/profiles/features/64bit-native/eapi b/profiles/features/64bit-native/eapi
97	deleted file mode 100644
98	index 7ed6ff82de6b..000000000000
99	--- a/profiles/features/64bit-native/eapi
100	+++ /dev/null
101	@@ -1 +0,0 @@
102	-5
103	diff --git a/profiles/features/64bit-native/make.defaults b/profiles/features/64bit-native/make.defaults
104	deleted file mode 100644
105	index 550c923fea54..000000000000
106	--- a/profiles/features/64bit-native/make.defaults
107	+++ /dev/null
108	@@ -1,10 +0,0 @@
109	-# Copyright 1999-2017 Gentoo Foundation
110	-# Distributed under the terms of the GNU General Public License v2
111	-# $Id$
112	-
113	-# We disable the symlink, since we won't be using it.
114	-SYMLINK_LIB="yes"
115	-
116	-# Since we're doing a pure 64-bit, we want LIBDIR to be lib64
117	-LIBDIR_amd64="lib64"
118	-LIBDIR_ppc64="lib64"
119	diff --git a/profiles/features/64bit-native/profile.bashrc b/profiles/features/64bit-native/profile.bashrc
120	deleted file mode 100644
121	index 71acdf820a05..000000000000
122	--- a/profiles/features/64bit-native/profile.bashrc
123	+++ /dev/null
124	@@ -1,18 +0,0 @@
125	-# Here we remove any ABI that isn't native.
126	-case ${ARCH} in
127	- mips)
128	- # Both n32 and n64 are 64-bit kernel and userland.
129	- # n64 is 64-bit pointers/long
130	- # n32 is 32-bit pointers/long
131	- case ${USE} in
132	- n32)
133	- export CFLAGS="${CFLAGS/-mabi=*/-mabi=n32}"
134	- export CXXFLAGS="${CFLAGS}"
135	- ;;
136	- n64)
137	- export CFLAGS="${CFLAGS/-mabi=*/-mabi=64}"
138	- export CXXFLAGS="${CFLAGS}"
139	- ;;
140	- esac
141	- ;;
142	-esac
143	diff --git a/profiles/features/64bit-native/use.force b/profiles/features/64bit-native/use.force
144	deleted file mode 100644
145	index 78a0ced5d86d..000000000000
146	--- a/profiles/features/64bit-native/use.force
147	+++ /dev/null
148	@@ -1,2 +0,0 @@
149	-# Force disable multilib USE flag
150	--multilib
151	diff --git a/profiles/features/64bit-native/use.mask b/profiles/features/64bit-native/use.mask
152	deleted file mode 100644
153	index 25c245751fb4..000000000000
154	--- a/profiles/features/64bit-native/use.mask
155	+++ /dev/null
156	@@ -1,9 +0,0 @@
157	-# Copyright 1999-2017 Gentoo Foundation
158	-# Distributed under the terms of the GNU General Public License v2
159	-# $Id$
160	-
161	-# USE flags masked because providing packages require a 32-bit ABI
162	-
163	-# 2008/02/13 - Chris Gianelloni <wolf31o2@g.o>
164	-# Mask multilib, since we cannot use it.
165	-multilib
166	--
167	2.11.0

Gentoo Archives: gentoo-dev