bircoph 15/05/15 20:23:37 Modified: ChangeLog root-6.02.05-r2.ebuild Log: temporary fix for bug 548698 Signed-off-by: Andrew Savchenko <birc...@gentoo.org> (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 565953B95372756C)
Revision Changes Path 1.147 sci-physics/root/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?rev=1.147&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?rev=1.147&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/ChangeLog?r1=1.146&r2=1.147 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- ChangeLog 1 May 2015 15:30:02 -0000 1.146 +++ ChangeLog 15 May 2015 20:23:37 -0000 1.147 @@ -1,6 +1,13 @@ # ChangeLog for sci-physics/root # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.146 2015/05/01 15:30:02 bircoph Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.147 2015/05/15 20:23:37 bircoph Exp $ + + 15 May 2015; Andrew Savchenko <birc...@gentoo.org> root-6.02.05-r2.ebuild, + -files/root-6.02.05-dictpch.patch: + Temporarily disable PCH dictionary regeneration due to bug 548698: + root has too many hardcode paths for cling-related stuff, this + should be fixed first for dictionary to be regenerated on root + install. 01 May 2015; Andrew Savchenko <birc...@gentoo.org> root-5.34.26.ebuild: 5.34.26 have no support for pythia-8.2 1.4 sci-physics/root/root-6.02.05-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-6.02.05-r2.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-6.02.05-r2.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/root/root-6.02.05-r2.ebuild?r1=1.3&r2=1.4 Index: root-6.02.05-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-physics/root/root-6.02.05-r2.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- root-6.02.05-r2.ebuild 15 Apr 2015 08:48:36 -0000 1.3 +++ root-6.02.05-r2.ebuild 15 May 2015 20:23:37 -0000 1.4 @@ -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/sci-physics/root/root-6.02.05-r2.ebuild,v 1.3 2015/04/15 08:48:36 bircoph Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-6.02.05-r2.ebuild,v 1.4 2015/05/15 20:23:37 bircoph Exp $ EAPI=5 @@ -212,7 +212,7 @@ # This can be done only at install stage, when files are placed # as appropriate. Premature modification of makepch.sh will # broke build process, however. - cp "etc/dictpch/makepch.sh" "etc/dictpch/makepch-gentoo.sh" || die + #cp "etc/dictpch/makepch.sh" "etc/dictpch/makepch-gentoo.sh" || die epatch \ "${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \ @@ -226,8 +226,8 @@ "${FILESDIR}"/${PN}-6.00.01-llvm.patch \ "${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \ "${FILESDIR}"/${PN}-6.00.01-prop-flags.patch \ - "${FILESDIR}"/${PN}-6.02.05-dictpch.patch \ "${FILESDIR}"/${PN}-6.02.05-xrootd4.patch + #"${FILESDIR}"/${PN}-6.02.05-dictpch.patch \ # make sure we use system libs and headers rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die @@ -423,14 +423,14 @@ use examples || rm -r ${DOC_DIR#/}/examples || die # clean hardcoded sandbox paths - rm etc/root/dictpch/allCppflags.txt.tmp || die - sed -i "s|${S}/||" etc/root/cling/llvm/Config/llvm-config.h || die + #rm etc/root/dictpch/allCppflags.txt.tmp || die + #sed -i "s|${S}/||" etc/root/cling/llvm/Config/llvm-config.h || die # regenerate pch for Gentoo headers layout - rm "etc/root/allDict.cxx.pch" || die - sed -i 's|etc/dictpch|etc/root/dictpch|' etc/root/dictpch/allLinkDefs.h || die - sed -i 's|etc/cling|etc/root/cling|' etc/root/dictpch/allHeaders.h || die - sed -i "s|ROOTDIR_TEMPLATE|${ED}|" etc/root/dictpch/makepch-gentoo.sh || die - etc/root/dictpch/makepch-gentoo.sh etc/root/allDict.cxx.pch || die "PCH generation failed" + #rm "etc/root/allDict.cxx.pch" || die + #sed -i 's|etc/dictpch|etc/root/dictpch|' etc/root/dictpch/allLinkDefs.h || die + #sed -i 's|etc/cling|etc/root/cling|' etc/root/dictpch/allHeaders.h || die + #sed -i "s|ROOTDIR_TEMPLATE|${ED}|" etc/root/dictpch/makepch-gentoo.sh || die + #etc/root/dictpch/makepch-gentoo.sh etc/root/allDict.cxx.pch || die "PCH generation failed" } src_install() {
