pesa 15/06/09 18:13:42 Modified: ChangeLog qt4-build-multilib.eclass Log: Remove two seds that are no longer needed on current Qt versions.
Revision Changes Path 1.1646 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1646&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1646&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1645&r2=1.1646 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1645 retrieving revision 1.1646 diff -u -r1.1645 -r1.1646 --- ChangeLog 9 Jun 2015 10:18:38 -0000 1.1645 +++ ChangeLog 9 Jun 2015 18:13:42 -0000 1.1646 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1645 2015/06/09 10:18:38 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1646 2015/06/09 18:13:42 pesa Exp $ + + 09 Jun 2015; Davide Pesavento <[email protected]> qt4-build-multilib.eclass: + Remove two seds that are no longer needed on current Qt versions. 09 Jun 2015; Gilles Dartiguelongue <[email protected]> gnome2.eclass, vala.eclass: 1.17 eclass/qt4-build-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.16&r2=1.17 Index: qt4-build-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- qt4-build-multilib.eclass 31 May 2015 13:56:53 -0000 1.16 +++ qt4-build-multilib.eclass 9 Jun 2015 18:13:42 -0000 1.17 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.16 2015/05/31 13:56:53 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.17 2015/06/09 18:13:42 pesa Exp $ # @ECLASS: qt4-build-multilib.eclass # @MAINTAINER: @@ -459,8 +459,15 @@ fi fi + # move pkgconfig files to the correct directory + local pcfile + for pcfile in "${D}/${QT4_LIBDIR}"/pkgconfig/*.pc; do + dodir /usr/$(get_libdir)/pkgconfig + mv "${pcfile}" "${ED}"/usr/$(get_libdir)/pkgconfig || die + done + rmdir "${D}/${QT4_LIBDIR}"/pkgconfig || die + install_qconfigs - fix_library_files fix_includes } @@ -547,7 +554,6 @@ QT4_PREFIX=${EPREFIX}/usr QT4_HEADERDIR=${QT4_PREFIX}/include/qt4 QT4_LIBDIR=${QT4_PREFIX}/$(get_libdir)/qt4 - QT4_PCDIR=${QT4_PREFIX}/$(get_libdir)/pkgconfig QT4_BINDIR=${QT4_LIBDIR}/bin QT4_PLUGINDIR=${QT4_LIBDIR}/plugins QT4_IMPORTDIR=${QT4_LIBDIR}/imports @@ -699,34 +705,6 @@ fi } -# @FUNCTION: fix_library_files -# @INTERNAL -# @DESCRIPTION: -# Fixes the paths in *.prl and *.pc, as they are wrong due to sandbox, and -# moves the *.pc files into the pkgconfig directory. -fix_library_files() { - local libfile - for libfile in "${D}"/${QT4_LIBDIR}/{*.prl,pkgconfig/*.pc}; do - if [[ -e ${libfile} ]]; then - sed -i -e "s:${S}/lib:${QT4_LIBDIR}:g" ${libfile} || die "sed on ${libfile} failed" - fi - done - - # pkgconfig files refer to WORKDIR/bin as the moc and uic locations - for libfile in "${D}"/${QT4_LIBDIR}/pkgconfig/*.pc; do - if [[ -e ${libfile} ]]; then - sed -i -e "s:${S}/bin:${QT4_BINDIR}:g" ${libfile} || die "sed on ${libfile} failed" - - # Move .pc files into the pkgconfig directory - dodir ${QT4_PCDIR#${EPREFIX}} - mv ${libfile} "${D}"/${QT4_PCDIR}/ || die "moving ${libfile} to ${D}/${QT4_PCDIR}/ failed" - fi - done - - # Don't install an empty directory - rmdir "${D}"/${QT4_LIBDIR}/pkgconfig -} - # @FUNCTION: fix_includes # @DESCRIPTION: # For MacOS X we need to add some symlinks when frameworks are
