/[gentoo-x86]/eclass/multilib-build.eclass
Gentoo

Diff of /eclass/multilib-build.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.40 Revision 1.41
1# Copyright 1999-2014 Gentoo Foundation 1# Copyright 1999-2014 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.40 2014/04/28 17:38:21 mgorny Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.41 2014/04/29 20:54:54 mgorny Exp $
4 4
5# @ECLASS: multilib-build.eclass 5# @ECLASS: multilib-build.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# gx86-multilib team <multilib@gentoo.org> 7# gx86-multilib team <multilib@gentoo.org>
8# @AUTHOR: 8# @AUTHOR:
292# be called to commit them to the installation tree. 292# be called to commit them to the installation tree.
293multilib_prepare_wrappers() { 293multilib_prepare_wrappers() {
294 debug-print-function ${FUNCNAME} "${@}" 294 debug-print-function ${FUNCNAME} "${@}"
295 295
296 [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments" 296 [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments"
297
298 [[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return
297 299
298 local root=${1:-${ED}} 300 local root=${1:-${ED}}
299 local f 301 local f
300 302
301 for f in "${MULTILIB_WRAPPED_HEADERS[@]}"; do 303 for f in "${MULTILIB_WRAPPED_HEADERS[@]}"; do
417multilib_install_wrappers() { 419multilib_install_wrappers() {
418 debug-print-function ${FUNCNAME} "${@}" 420 debug-print-function ${FUNCNAME} "${@}"
419 421
420 [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments" 422 [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments"
421 423
424 [[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return
425
422 local root=${1:-${ED}} 426 local root=${1:-${ED}}
423 427
424 if [[ -d "${ED}"/tmp/multilib-include ]]; then 428 if [[ -d "${ED}"/tmp/multilib-include ]]; then
425 multibuild_merge_root \ 429 multibuild_merge_root \
426 "${ED}"/tmp/multilib-include "${root}"/usr/include 430 "${ED}"/tmp/multilib-include "${root}"/usr/include

Legend:
Removed from v.1.40  
changed lines
  Added in v.1.41

  ViewVC Help
Powered by ViewVC 1.1.20