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

Diff of /eclass/autotools-multilib.eclass

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

Revision 1.13 Revision 1.14
1# Copyright 1999-2013 Gentoo Foundation 1# Copyright 1999-2013 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/autotools-multilib.eclass,v 1.13 2013/04/01 09:18:57 mgorny Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.14 2013/04/01 11:05:27 mgorny Exp $
4 4
5# @ECLASS: autotools-multilib.eclass 5# @ECLASS: autotools-multilib.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Michał Górny <mgorny@gentoo.org> 7# Michał Górny <mgorny@gentoo.org>
8# @BLURB: autotools-utils wrapper for multilib builds 8# @BLURB: autotools-utils wrapper for multilib builds
81 81
82 if [[ ${f} != usr/include/* ]]; then 82 if [[ ${f} != usr/include/* ]]; then
83 die "Wrapping headers outside of /usr/include is not supported at the moment." 83 die "Wrapping headers outside of /usr/include is not supported at the moment."
84 fi 84 fi
85 # and then usr/include 85 # and then usr/include
86 f=${f#usr/include/} 86 f=${f#usr/include}
87 87
88 local dir=${f%/*} 88 local dir=${f%/*}
89 89
90 # $CHOST shall be set by multilib_toolchain_setup 90 # $CHOST shall be set by multilib_toolchain_setup
91 dodir "/tmp/multilib-include/${CHOST}/${dir}" 91 dodir "/tmp/multilib-include/${CHOST}${dir}"
92 mv "${ED}/usr/include/${f}" "${ED}/tmp/multilib-include/${CHOST}/${dir}/" || die 92 mv "${ED}/usr/include${f}" "${ED}/tmp/multilib-include/${CHOST}${dir}/" || die
93 93
94 if [[ ! -f ${ED}/tmp/multilib-include/${f} ]]; then 94 if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then
95 dodir "/tmp/multilib-include/${dir}" 95 dodir "/tmp/multilib-include${dir}"
96 # a generic template 96 # a generic template
97 cat > "${ED}/tmp/multilib-include/${f}" <<_EOF_ || die 97 cat > "${ED}/tmp/multilib-include${f}" <<_EOF_ || die
98/* This file is auto-generated by autotools-multilib.eclass 98/* This file is auto-generated by autotools-multilib.eclass
99 * as a multilib-friendly wrapper. For the original content, 99 * as a multilib-friendly wrapper. For the original content,
100 * please see the files that are #included below. 100 * please see the files that are #included below.
101 */ 101 */
102 102
127 die "Header wrapping for ${ABI} not supported yet";; 127 die "Header wrapping for ${ABI} not supported yet";;
128 esac 128 esac
129 129
130 # Note: match a space afterwards to avoid collision potential. 130 # Note: match a space afterwards to avoid collision potential.
131 sed -e "/${abi_flag} /s&error.*&include <${CHOST}/${f}>&" \ 131 sed -e "/${abi_flag} /s&error.*&include <${CHOST}/${f}>&" \
132 -i "${ED}/tmp/multilib-include/${f}" || die 132 -i "${ED}/tmp/multilib-include${f}" || die
133 done 133 done
134} 134}
135 135
136autotools-multilib_src_install() { 136autotools-multilib_src_install() {
137 autotools-multilib_secure_install() { 137 autotools-multilib_secure_install() {

Legend:
Removed from v.1.13  
changed lines
  Added in v.1.14

  ViewVC Help
Powered by ViewVC 1.1.20