Gentoo Archives: gentoo-commits

From: Michael Orlitzky <mjo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/default/linux/, profiles/features/hardened/
Date: Sun, 07 Oct 2018 21:55:12
Message-Id: 1538949173.0f7838027ac84f2a57d98823e8b259677fe6ef36.mjo@gentoo
1 commit: 0f7838027ac84f2a57d98823e8b259677fe6ef36
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 14 15:31:24 2018 +0000
4 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 7 21:52:53 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f783802
7
8 profiles: unset USE=modules by default.
9
10 The "modules" USE flag was originally enabled by default in the base
11 profile so that any ebuild inheriting linux-mod.eclass would have its
12 kernel modules built by default. However, the name of that USE flag is
13 now controlled by the MODULES_OPTIONAL_USE variable, set in the ebuild
14 itself. The best place for the USE flag default is therefore in IUSE
15 (in the ebuild), because only the ebuild knows the correct flag name.
16
17 There are at least two packages, media-gfx/graphicsmagick and
18 net-im/mcabber, that assign a different meaning to the "modules" flag,
19 further suggesting that a global default is too blunt an approach.
20
21 This commit drops the flag from base/make.defaults, and also from
22 default/linux/make.defaults where a redundant entry was present.
23 Thereafter, the override in features/hardened/make.defaults is
24 unnecessary, so it has been dropped as well.
25
26 Closes: https://bugs.gentoo.org/635720
27 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
28
29 profiles/base/make.defaults | 5 -----
30 profiles/default/linux/make.defaults | 5 -----
31 profiles/features/hardened/make.defaults | 1 -
32 3 files changed, 11 deletions(-)
33
34 diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
35 index a0a1d4f977b..6e1ada342cf 100644
36 --- a/profiles/base/make.defaults
37 +++ b/profiles/base/make.defaults
38 @@ -92,11 +92,6 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
39 # Netbeans modules/clusters
40 NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml"
41
42 -# 2009/09/21 Robin H. Johnson <robbat2@g.o>
43 -# https://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml
44 -# Build kernel modules from linux-mod by default:
45 -USE="${USE} modules"
46 -
47 # Manuel RĂ¼ger <mrueg@g.o> (09 Sep 2015)
48 # Default Ruby build target
49 # Updated to include ruby23 on 21 Jan 2018
50
51 diff --git a/profiles/default/linux/make.defaults b/profiles/default/linux/make.defaults
52 index 4d580b1ba06..0716de8a14c 100644
53 --- a/profiles/default/linux/make.defaults
54 +++ b/profiles/default/linux/make.defaults
55 @@ -53,8 +53,3 @@ VIDEO_CARDS="dummy fbdev v4l"
56 # Note that adding LDFLAGS="-Wl,-O1 ${LDFLAGS}" breaks dev-util/boost-build
57 # because of whitespace.
58 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
59 -
60 -# 2009/09/21 Robin H. Johnson <robbat2@g.o>
61 -# https://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml
62 -# Build kernel modules from linux-mod by default:
63 -USE="${USE} modules"
64
65 diff --git a/profiles/features/hardened/make.defaults b/profiles/features/hardened/make.defaults
66 index 1502b08728f..88e165c4611 100644
67 --- a/profiles/features/hardened/make.defaults
68 +++ b/profiles/features/hardened/make.defaults
69 @@ -24,4 +24,3 @@ USE="${USE} -berkdb -gdbm -tcpd"
70 USE="${USE} -fortran"
71 USE="${USE} -cli"
72 USE="${USE} -dri"
73 -USE="${USE} -modules"