summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-01-14 08:22:13 +0000
committerMike Frysinger <vapier@gentoo.org>2012-01-14 08:22:13 +0000
commitbc9778818a3788ccf92dfdbc483d9e4eb0da58cb (patch)
tree919145e3df28f6aca79fee7aeee46d39db630d79 /eclass
parentFor nautilus-python-1.1-r1, always depend on pygobject:3 (both for sanity and... (diff)
downloadgentoo-2-bc9778818a3788ccf92dfdbc483d9e4eb0da58cb.tar.gz
gentoo-2-bc9778818a3788ccf92dfdbc483d9e4eb0da58cb.tar.bz2
gentoo-2-bc9778818a3788ccf92dfdbc483d9e4eb0da58cb.zip
mark has_m32 as dead since no one uses it, and mark has_m64 as a warning until xalan-c gets fixed #398855
Diffstat (limited to 'eclass')
-rw-r--r--eclass/flag-o-matic.eclass25
1 files changed, 4 insertions, 21 deletions
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 0dfc6894c596..e30a3a96407d 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.165 2012/01/14 08:05:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.166 2012/01/14 08:22:13 vapier Exp $
# @ECLASS: flag-o-matic.eclass
# @MAINTAINER:
@@ -519,6 +519,8 @@ get-flag() {
# 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
@@ -534,27 +536,8 @@ has_m64() {
return 1
}
-# @FUNCTION: has_m32
-# @DESCRIPTION:
-# This doesn't test if the flag is accepted, it tests if the flag actually
-# WORKS. Non-mulilib gcc will take both -m32 and -64. If the flag works return
-# code is 0, else return code is 1.
has_m32() {
- # 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!
-
- [ "$(tc-arch)" = "amd64" ] && has_multilib_profile && return 0
-
- local temp=$(emktemp)
- echo "int main() { return(0); }" > "${temp}".c
- MY_CC=$(tc-getCC)
- ${MY_CC/ .*/} -m32 -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"
}
# @FUNCTION: replace-sparc64-flags