Gentoo Archives: gentoo-dev

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

Replies