diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-04-25 17:43:50 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-04-25 17:43:50 +0000 |
| commit | 12be7d86491034a1a30f43b4fe33e497db8b5516 (patch) | |
| tree | bcd68b9ffe55d499ea8c2b5773bf81bcf767fb66 /eclass | |
| parent | Fix ChangeLog entry. (diff) | |
| download | gentoo-2-12be7d86491034a1a30f43b4fe33e497db8b5516.tar.gz gentoo-2-12be7d86491034a1a30f43b4fe33e497db8b5516.tar.bz2 gentoo-2-12be7d86491034a1a30f43b4fe33e497db8b5516.zip | |
fix_includes: create relative symlinks for header directories, such that further additions by ebuilds in src_install don't fail, such as in qt-script
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/qt4-build.eclass | 27 |
2 files changed, 27 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 2251f89738fe..ff0a007eac30 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.223 2012/04/24 13:07:03 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.224 2012/04/25 17:43:50 grobian Exp $ + + 25 Apr 2012; Fabian Groffen <grobian@gentoo.org> qt4-build.eclass: + fix_includes: create relative symlinks for header directories, such that + further additions by ebuilds in src_install don't fail 24 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> myspell-r2.eclass: Oops didn't commit the dir supporting version. This replaces plain doins with diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 366629ff99df..e27f19b0a079 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.125 2012/04/19 14:52:12 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.126 2012/04/25 17:43:50 grobian Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -504,21 +504,38 @@ qt4-build_src_test() { # being used, to avoid complications with some more or less stupid packages. fix_includes() { if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then + local frw dest f h rdir # Some packages tend to include <Qt/...> dodir "${QTHEADERDIR#${EPREFIX}}"/Qt - # Fake normal headers when frameworks are installed... eases life later on - local dest f h + # Fake normal headers when frameworks are installed... eases life later + # on, make sure we use relative links though, as some ebuilds assume + # these dirs exist in src_install to add additional files + f=${QTHEADERDIR} + h=${QTLIBDIR} + while [[ -n ${f} && ${f%%/*} == ${h%%/*} ]] ; do + f=${f#*/} + h=${h#*/} + done + rdir=${h} + f="../" + while [[ ${h} == */* ]] ; do + f="${f}../" + h=${h#*/} + done + rdir="${f}${rdir}" + for frw in "${D}${QTLIBDIR}"/*.framework; do [[ -e "${frw}"/Headers ]] || continue f=$(basename ${frw}) dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework} - dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers "${dest}" + dosym "${rdir}"/${f}/Headers "${dest}" # Link normal headers as well. for hdr in "${D}/${QTLIBDIR}/${f}"/Headers/*; do h=$(basename ${hdr}) - dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers/${h} "${QTHEADERDIR#${EPREFIX}}"/Qt/${h} + dosym "../${rdir}"/${f}/Headers/${h} \ + "${QTHEADERDIR#${EPREFIX}}"/Qt/${h} done done fi |