From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5E8E5138C48 for ; Sun, 12 Apr 2015 13:56:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB259E0C38; Sun, 12 Apr 2015 13:56:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 515CCE0C38 for ; Sun, 12 Apr 2015 13:56:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DDD5C3409C7 for ; Sun, 12 Apr 2015 13:56:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F7EE15C23 for ; Sun, 12 Apr 2015 13:55:59 +0000 (UTC) From: "Andrew Savchenko" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Savchenko" Message-ID: <1428846893.a10464578b87f8847a60df6c1aced2690de9fa0b.bircoph@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/root/files/, sci-physics/root/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/root/ChangeLog sci-physics/root/files/root-6.02.05-dictpch.patch sci-physics/root/root-6.02.05-r1.ebuild sci-physics/root/root-6.02.05-r2.ebuild X-VCS-Directories: sci-physics/root/files/ sci-physics/root/ X-VCS-Committer: bircoph X-VCS-Committer-Name: Andrew Savchenko X-VCS-Revision: a10464578b87f8847a60df6c1aced2690de9fa0b X-VCS-Branch: master Date: Sun, 12 Apr 2015 13:55:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fa6b9428-7513-4d26-8a19-966008998e63 X-Archives-Hash: f7514d4557f7a6bd6aff2f4bf94433c5 commit: a10464578b87f8847a60df6c1aced2690de9fa0b Author: Andrew Savchenko gmail com> AuthorDate: Sun Apr 12 13:54:53 2015 +0000 Commit: Andrew Savchenko gmail com> CommitDate: Sun Apr 12 13:54:53 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a1046457 fix issue #238 Regenerate PCH headers for Gentoo include files layout and remove extra $PORTAGE_TMPDIR from /etc. sci-physics/root/ChangeLog | 7 +++++ sci-physics/root/files/root-6.02.05-dictpch.patch | 31 ++++++++++++++++++++++ ...ot-6.02.05-r1.ebuild => root-6.02.05-r2.ebuild} | 18 +++++++++++++ 3 files changed, 56 insertions(+) diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index b1b0b0a..4fc73e8 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $ +*root-6.02.05-r2 (12 Apr 2015) + + 12 Apr 2015; Andrew Savchenko -root-6.02.05-r1.ebuild, + +root-6.02.05-r2.ebuild, +files/root-6.02.05-dictpch.patch: + Regenerate PCH headers for Gentoo include files layout and remove + extra $PORTAGE_TMPDIR from /etc (github issue #238). + *root-6.02.05-r1 (11 Apr 2015) 11 Apr 2015; Andrew Savchenko -root-6.02.05.ebuild, diff --git a/sci-physics/root/files/root-6.02.05-dictpch.patch b/sci-physics/root/files/root-6.02.05-dictpch.patch new file mode 100644 index 0000000..80a416e --- /dev/null +++ b/sci-physics/root/files/root-6.02.05-dictpch.patch @@ -0,0 +1,31 @@ +--- etc/dictpch/makepch-gentoo.sh.orig 2015-04-08 14:27:07.781026830 +0300 ++++ etc/dictpch/makepch-gentoo.sh 2015-04-12 13:40:48.226060739 +0300 +@@ -13,8 +13,8 @@ + # Copyright (c) 2014 Rene Brun and Fons Rademakers + # Author: Axel Naumann , 2014-10-16 + +-rootdir=. +-cfgdir=etc/dictpch ++rootdir=ROOTDIR_TEMPLATE ++cfgdir=etc/root/dictpch + allheaders=$cfgdir/allHeaders.h + alllinkdefs=$cfgdir/allLinkDefs.h + cppflags=$cfgdir/allCppflags.txt +@@ -36,7 +36,7 @@ + rootbuild=-rootbuild + fi + +-cxxflags="-D__CLING__ -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DROOT_PCH -I$rootdir/include -I$rootdir/etc -I$rootdir/$cfgdir -I$rootdir/etc/cling `cat $rootdir/$cppflags`" ++cxxflags="-D__CLING__ -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DROOT_PCH -I$rootdir/usr/include/root -I$rootdir/etc/root -I$rootdir/$cfgdir -I$rootdir/etc/root/cling `cat $rootdir/$cppflags`" + + if ! [ "x$1" = "x" ]; then + cxxflags="$cxxflags $1" +@@ -44,7 +44,7 @@ + + # generate pch + touch allDict.cxx.h +-$rootdir/bin/rootcling $rootbuild -1 -f allDict.cxx -noDictSelection -c $cxxflags $allheaders $@ $alllinkdefs ++$rootdir/usr/bin/rootcling -1 -f allDict.cxx -noDictSelection -c $cxxflags $allheaders $@ $alllinkdefs + res=$? + if [ $res -eq 0 ] ; then + mv allDict_rdict.pch $pch diff --git a/sci-physics/root/root-6.02.05-r1.ebuild b/sci-physics/root/root-6.02.05-r2.ebuild similarity index 93% rename from sci-physics/root/root-6.02.05-r1.ebuild rename to sci-physics/root/root-6.02.05-r2.ebuild index 2d7388b..9069f3a 100644 --- a/sci-physics/root/root-6.02.05-r1.ebuild +++ b/sci-physics/root/root-6.02.05-r2.ebuild @@ -207,6 +207,13 @@ pkg_setup() { } src_prepare() { + # Second version of makepch is required in order to generate + # PCH file appropriate for Gentoo include headers layout. + # 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 + epatch \ "${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \ "${FILESDIR}"/${PN}-5.32.00-afs.patch \ @@ -219,6 +226,7 @@ src_prepare() { "${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 # make sure we use system libs and headers @@ -410,6 +418,16 @@ cleanup_install() { mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die rm ${DOC_DIR#/}/{INSTALL,LICENSE} || die 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 + # 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" } src_install() {