summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorSteven J Newbury <steve@snewbury.org.uk>2009-04-23 00:56:40 +0100
committerSteven J Newbury <steve@snewbury.org.uk>2009-04-23 00:56:40 +0100
commit07c0b49b41743ac44dd93fe22089c1bd34ccd07a (patch)
tree3242b96a8430aae43b0524ccc245b1ac737e1eac /eclass
parentWhen appending CFLAGS to FCFLAGS and FFLAGS there's no need to then (diff)
downloadmultilib-portage-07c0b49b41743ac44dd93fe22089c1bd34ccd07a.tar.gz
multilib-portage-07c0b49b41743ac44dd93fe22089c1bd34ccd07a.tar.bz2
multilib-portage-07c0b49b41743ac44dd93fe22089c1bd34ccd07a.zip
Reduce multilib_debug output
Diffstat (limited to 'eclass')
-rw-r--r--eclass/multilib-native.eclass14
1 files changed, 0 insertions, 14 deletions
diff --git a/eclass/multilib-native.eclass b/eclass/multilib-native.eclass
index ea03f3b79..ec9b6ce4e 100644
--- a/eclass/multilib-native.eclass
+++ b/eclass/multilib-native.eclass
@@ -217,9 +217,6 @@ multilib-native_setup_abi_env() {
export LIBDIR=$(get_abi_LIBDIR $1)
export LDFLAGS="${LDFLAGS} -L/${LIBDIR} -L/usr/${LIBDIR}"
- multilib_debug "CHOST" ${CHOST}
- multilib_debug "${ABI} CC" "${CC}"
- multilib_debug "${ABI} LD" "${LD}"
# Multilib QT Support - This is needed for QT and CMake based packages
if [[ -n ${QTDIR} ]] || ${QTBINDIR} || [[ -n "${CMAKE_BUILD_TYPE}" ]]; then
libsuffix="${EMULTILIB_LIBDIR[$(multilib-native_abi_to_index_key ${1})]/lib}"
@@ -240,7 +237,6 @@ multilib-native_setup_abi_env() {
QTBINDIR="/usr/bin"
fi
QMAKE="${QTBINDIR}/qmake"
- multilib_debug "${ABI} QMAKESPEC" "${QMAKESPEC}"
fi
# If we aren't building for the DEFAULT ABI we may need to use some
@@ -263,25 +259,20 @@ multilib-native_setup_abi_env() {
# Multilib CMake Support, qmake provides the paths to link QT
mycmakeargs="${mycmakeargs} \
-DQT_QMAKE_EXECUTABLE:FILEPATH=${QMAKE}"
- multilib_debug "${ABI} mycmakeargs" "${mycmakeargs}"
CMAKE_BUILD_DIR="${WORKDIR}/${PN}_build_${ABI}/${EMULTILIB_RELATIVE_BUILD_DIR/${EMULTILIB_SOURCE_TOP_DIRNAME}}"
[[ -n "${CMAKE_IN_SOURCE_BUILD}" ]] && \
S="${CMAKE_BUILD_DIR}"
- multilib_debug "${ABI} CMAKE_BUILD_DIR" "${CMAKE_BUILD_DIR}"
-
else
S="${WORKDIR}/${PN}_build_${ABI}/${EMULTILIB_RELATIVE_BUILD_DIR/${EMULTILIB_SOURCE_TOP_DIRNAME}}"
if [[ -n ${MULTILIB_EXT_SOURCE_BUILD} ]]; then
ECONF_SOURCE="${EMULTILIB_SOURCE_TOPDIR}/${EMULTILIB_RELATIVE_BUILD_DIR/${EMULTILIB_SOURCE_TOP_DIRNAME}}"
fi
- multilib_debug "${ABI} ECONF_SOURCE" "${ECONF_SOURCE}"
fi
# If KDE_S is defined then the kde.eclass is in use
if [[ -n ${KDE_S} ]]; then
KDE_S="${S}"
- multilib_debug "${ABI} KDE_S" "${KDE_S}"
fi
# ccache is ABI dependent
@@ -391,10 +382,6 @@ multilib-native_src_generic_sub() {
einfo "Determining SOURCE_TOPDIR from S and WORKDIR"
EMULTILIB_RELATIVE_BUILD_DIR="${S#*${WORKDIR}\/}"
EMULTILIB_SOURCE_TOP_DIRNAME="${EMULTILIB_RELATIVE_BUILD_DIR%%/*}"
- multilib_debug WORKDIR "${WORKDIR}"
- multilib_debug S "${S}"
- multilib_debug EMULTILIB_RELATIVE_BUILD_DIR "${EMULTILIB_RELATIVE_BUILD_DIR}"
- multilib_debug EMULTILIB_SOURCE_TOP_DIRNAME "${EMULTILIB_SOURCE_TOP_DIRNAME}"
# If ${EMULTILIB_SOURCE_TOP_DIRNAME} is
# empty, then we assume ${S} points to the top level.
# (This should never happen.)
@@ -402,7 +389,6 @@ multilib-native_src_generic_sub() {
ewarn "Unable to determine dirname of the source topdir:"
ewarn "Assuming S points to the top level"
EMULTILIB_SOURCE_TOP_DIRNAME=${EMULTILIB_RELATIVE_BUILD_DIR}
- multilib_debug EMULTILIB_SOURCE_TOP_DIRNAME ${EMULTILIB_SOURCE_TOP_DIRNAME}
fi
EMULTILIB_SOURCE_TOPDIR="${WORKDIR}/${EMULTILIB_SOURCE_TOP_DIRNAME}"
multilib_debug EMULTILIB_SOURCE_TOPDIR ${EMULTILIB_SOURCE_TOPDIR}