Gentoo Archives: gentoo-dev

From: Ulrich Mueller <ulm@g.o>
To: gentoo-dev <gentoo-dev@l.g.o>
Subject: [gentoo-dev] RFC: small cleanup of flag-o-matic.eclass
Date: Sun, 12 Feb 2017 09:28:59
Message-Id: 22688.10925.330993.283124@a1i15.kph.uni-mainz.de
1 See patch below. The has_m64 function is no longer used in the tree.
2
3 Unfortunately, we cannot get rid of the eutils inherit because it is
4 still used for eqawarn.
5
6 Ulrich
7
8
9 From 84334ae8abd85c7880e5a357ff8f71bc8bdb1eee Mon Sep 17 00:00:00 2001
10 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@g.o>
11 Date: Sat, 11 Feb 2017 11:04:51 +0100
12 Subject: [PATCH] flag-o-matic.eclass: Mark has_m64() as dead.
13
14 The function is not used by any ebuild.
15 ---
16 eclass/flag-o-matic.eclass | 23 ++---------------------
17 1 file changed, 2 insertions(+), 21 deletions(-)
18
19 diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
20 index 23319ad407f5..57d207b08313 100644
21 --- a/eclass/flag-o-matic.eclass
22 +++ b/eclass/flag-o-matic.eclass
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2014 Gentoo Foundation
25 +# Copyright 1999-2017 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 # $Id$
28
29 @@ -562,27 +562,8 @@ get-flag() {
30 return 1
31 }
32
33 -# @FUNCTION: has_m64
34 -# @DESCRIPTION:
35 -# This doesn't test if the flag is accepted, it tests if the flag actually
36 -# WORKS. Non-multilib gcc will take both -m32 and -m64. If the flag works
37 -# return code is 0, else the return code is 1.
38 has_m64() {
39 - eqawarn "${FUNCNAME}: don't use this anymore"
40 -
41 - # this doesnt test if the flag is accepted, it tests if the flag
42 - # actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
43 - # please dont replace this function with test_flag in some future
44 - # clean-up!
45 -
46 - local temp="$(emktemp)"
47 - echo "int main() { return(0); }" > "${temp}".c
48 - MY_CC=$(tc-getCC)
49 - ${MY_CC/ .*/} -m64 -o "$(emktemp)" "${temp}".c > /dev/null 2>&1
50 - local ret=$?
51 - rm -f "${temp}".c
52 - [[ ${ret} != 1 ]] && return 0
53 - return 1
54 + die "${FUNCNAME}: don't use this anymore"
55 }
56
57 has_m32() {
58 --
59 2.11.1

Replies

Subject Author
Re: [gentoo-dev] RFC: small cleanup of flag-o-matic.eclass Alexis Ballier <aballier@g.o>