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
See patch below. The has_m64 function is no longer used in the tree.

Unfortunately, we cannot get rid of the eutils inherit because it is
still used for eqawarn.

Ulrich


From 84334ae8abd85c7880e5a357ff8f71bc8bdb1eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@g.o>
Date: Sat, 11 Feb 2017 11:04:51 +0100
Subject: [PATCH] flag-o-matic.eclass: Mark has_m64() as dead.

The function is not used by any ebuild.
---
 eclass/flag-o-matic.eclass | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 23319ad407f5..57d207b08313 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -562,27 +562,8 @@ get-flag() {
 	return 1
 }
 
-# @FUNCTION: has_m64
-# @DESCRIPTION:
-# This doesn't test if the flag is accepted, it tests if the flag actually
-# WORKS. Non-multilib gcc will take both -m32 and -m64. If the flag works
-# return code is 0, else the return code is 1.
 has_m64() {
-	eqawarn "${FUNCNAME}: don't use this anymore"
-
-	# this doesnt test if the flag is accepted, it tests if the flag
-	# actually -WORKS-. non-multilib gcc will take both -m32 and -m64!
-	# please dont replace this function with test_flag in some future
-	# clean-up!
-
-	local temp="$(emktemp)"
-	echo "int main() { return(0); }" > "${temp}".c
-	MY_CC=$(tc-getCC)
-	${MY_CC/ .*/} -m64 -o "$(emktemp)" "${temp}".c > /dev/null 2>&1
-	local ret=$?
-	rm -f "${temp}".c
-	[[ ${ret} != 1 ]] && return 0
-	return 1
+	die "${FUNCNAME}: don't use this anymore"
 }
 
 has_m32() {
-- 
2.11.1

Replies

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