aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gmail.com>2012-07-22 12:02:06 +0400
committerAndrew Savchenko <bircoph@gmail.com>2012-07-22 12:02:06 +0400
commita115046e7624dd639db7afea3b3863bc1aedab36 (patch)
tree4efb4c5679282ffe416a9cbe4f5e4b46a0103851
parentapp-doc/root-docs: update live ebuild (diff)
downloadsci-a115046e7624dd639db7afea3b3863bc1aedab36.tar.gz
sci-a115046e7624dd639db7afea3b3863bc1aedab36.tar.bz2
sci-a115046e7624dd639db7afea3b3863bc1aedab36.zip
sci-physics/root: improve cling support
However, patched llvm/clang is still required.
-rw-r--r--sci-physics/root/ChangeLog6
-rw-r--r--sci-physics/root/Manifest5
-rw-r--r--sci-physics/root/files/root-9999-cling.patch13
-rw-r--r--sci-physics/root/root-9999.ebuild3
4 files changed, 24 insertions, 3 deletions
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 6867500bb..f575ac23a 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2012 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 $
+ 22 Jul 2012; Andrew Savchenko <bircoph@gmail.com> root-9999.ebuild,
+ +files/root-9999-cling.patch:
+ One step further to build with cling. But ATM patched version of
+ llvm/clang is still required. Perhaps, we should install it
+ elsewhere as a separate package?
+
21 Jul 2012; Andrew Savchenko <bircoph@gmail.com> root-9999.ebuild,
metadata.xml:
Clarens and PEAC were removed from ROOT.
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 1dd5ed767..e62d70a47 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -10,6 +10,7 @@ AUX root-5.32.00-chklib64.patch 866 SHA256 5260cb5e7ab62bb19f6586cf4d9033597bcfd
AUX root-5.32.00-dotfont.patch 2563 SHA256 7b4fc5da17ee8bfa71ed4cb60926a02e4b7058f8955dd54fb7f15ee4910823f6 SHA512 332ffe0ac6d1249ef1643b6a1df77ef23c1af1c4547f248295c1ae9c284384446a84a374b2b117b1157e770ac65a404be1c4cc17a497c43e2c34bcbf51619441 WHIRLPOOL 9633f52670bd8ad65393ddba7b2152e644feedb97df479229a07b232da10e4fae911356c2700fc0ff552096e575fb29882e46e38f609399ecbdc97f3f16b8e96
AUX root-5.32.00-htmldoc.patch 485 SHA256 96674266856275b0ef83feefebc2fd5cd3edf73f207b2349b9c44e81e6ac7b98 SHA512 924f3d1cad1a5db0785e5741eb508fccc48bdd5750b938210b4c810b60c081b4855001cf30643dc2c2450364865a724f619fe9043123be8bad9bac03811c26c5 WHIRLPOOL 054018d8f85f4f0be177fc733c1509f15a8326a86be31dc59b764bb21304a4ac80dec23467780812322194174e472df5254307ce3d1870f0d4b26b293ba061d9
AUX root-5.32.00-nobyte-compile.patch 5527 SHA256 82152c92efd5002f9c2b230f141cae6c8111b03bd18370030d62f0f7d7127420 SHA512 582a43ff07609189c5ef8627b7e0739c9c917a7316c37bda8a3f5d7132de6f3f038edc6599bf43da959a15ce630e96014bb8fa1b175555a94bd7d8d748476d5c WHIRLPOOL e3753dbd7b9df54dce4941f041aed94628350615bbee23fd4a3fc571a890e9c1fe352ab04b298f84cd51c52bedfdf730434ea6c57142ea7165e4530508a34942
+AUX root-9999-cling.patch 434 SHA256 64c910853f1766d4706b568c0b5243eb34a1547388b5bcc1e8ff435d132829c6 SHA512 876c8b5aca92be47e7ffd05af2b9ec4cbf4c6c40d6a7ce9918ad6d5ee5180e600acb6be7003f0dde86a194737c1148d07098bb726e792ab7ed54511f4202b2eb WHIRLPOOL 904ee7c5a8903d3dcdbf85a97d6069928ccb34b1a662bbe661520633b0e0ecb462debbb5a767c0d61c1c2cac28f7900fa6020b7988e5d4ea8957a28db1ec462a
AUX root-9999-dotfont.patch 2718 SHA256 27d05ede039fb85472203839a628b15f8ee9fc3c39e1d29a19349e069f891d61 SHA512 8f01655e863d36678dea37df934e3d8d9c2bc85920497345feb8d863bdc1b7413c783b916050d1e7b476ecdf9e1e8afdcbb32e621d625305898d51947b6955c6 WHIRLPOOL 75e2712f13cf64102fd0dce6d92c7c21c3606ad4679615336ce6b607f236eb6b1d57ffa0498ae3df194b08c6cdc371fef36912fb3e3cc1fc84ac3f1664793708
AUX rootd.confd 199 SHA256 7b69f646ce0b2546ce797ec4a05949b02302dc5f4e41d2e8896ed0bc6575ac8d SHA512 2ce6753d37a7f22cc3656f110f802b8e07c1469bfe4524606c1472369352f8c584c01c716760252fab40369470b72d8c77cdbb2d52126c39371faaf597bf58d8 WHIRLPOOL b4c65e5026d6583775cda7b13fdbc5ae48c82c36710efbdd6b112243310090c05b5726d6e76d1ae25d585ecaa4aec4a5059336bf54135bafd0e4a921db468742
AUX rootd.initd 732 SHA256 42b9fe01aa41965359c16d4b23f874cea65806d8c7ec11215dbba95ab80e90f3 SHA512 65152830554ed509db7e5545bffb4976a608ee576d62ac648fc5520ff96ea5062c9b20c195dad2cf8dc2b34079e6beb252d427030825e14dc867ae4599bc64b8 WHIRLPOOL ec03db863e079b3f910ec0f86b036a828b2a5804f6bd6e0398e5207000f1ca10b6b1e71504d6c6b3a2d216b20d7db27d2425070f9d6bb0696ef384dfe8526fc0
@@ -21,6 +22,6 @@ DIST root-banner.png 132555 SHA256 d165e1cc175f654ff79af39193a6144678f600e14a53d
DIST root_v5.34.00.source.tar.gz 56214534 SHA256 808e04876dbc9cfbfea54ee11ba35e90382e8ff4219dbdbe2d2236a9dadf7df1 SHA512 2502281b8b5de5771d5a135080d2aba7797a477e0a769c8e6b2801959896bb4b0ce8f2e0c6a64459ffb28e46d681cad0b8af5430c0648654b57a9a3d744a499d WHIRLPOOL e7db950b5460ec8871b4b2b191d33850b23951b0de3285aad602d380f3935f3ab7ac86cd6fb8ab6534d188bf31a80c0e3d7972f931f7d9588274d9b76bea7861
DIST rootdrawing-logo.png 15051 SHA256 1dfd913cad53a3ebd6bf560d14df918cab5a295cc7d155944a8e27284af83a6b SHA512 14aa13ebfed3c9412d7d7d04c250740b25fe3af6bcb07e618045a5cec2dc23698a251fd7df2db1a6c37331084db99b029b387ea81c25ac825fc7ae10ad164a68 WHIRLPOOL 877a959a5aead73ba69dbb805c9869cbd6a047ea476bd4e7fef80781563a61d20dad49dd4d8b0005bfc58e8f7c7d38efbb3e085a95974feb81dfc9e339c18741
EBUILD root-5.34.00.ebuild 11481 SHA256 35a875e149b816e742d3f304aac7c9c103e04bd03e8f3f66bfc88ad1a95c822f SHA512 e2af92739823988e5e173d7fc412cafb0cd535bb348c590c6e7d9dae9fdf9a48c565ae04c2376ab0183110463bb9c51e14dbe34acb74442a1634cbac4e24dbbc WHIRLPOOL 334a07736bf6b0a56e290d10b9031c87c6b0579393b87a616335fa3c844f03b3c2edc10d48e83b640779d30444b4871039ef56d9ffa2f3ecaffb2f2d739d5289
-EBUILD root-9999.ebuild 11511 SHA256 97d92d577c69735b426b7ff6cfb5be6d95de7458a9ce51c97b701641b57705d5 SHA512 0354430984939572be237ebbfef571a6f566268b1b0bc58ce2013a0371d621a893e8ec0bf2eaec5f41e6bffa760f7b110820f2b09d4f04b914031e4dc20ead66 WHIRLPOOL 8dce09701be1aef0897dbfe57d88ac646d6c111c9303bb485e48e4b14df1a32c2d221f4458818ba1843c539bb70487c4e3755bf1790acd928cde90b38b5ace62
-MISC ChangeLog 32083 SHA256 a43e96f42f7b8d38db3e158a3525f932622c4ba53642c0267ffee7ab105adf05 SHA512 e5f133903d175a0ce45f6a2e533f8afe9c6c83a1e68e9687a929afc3f6572ad752d2785d0eeee9958b71f8e9bda1e0a7b4df3455d92a7d94c05b059428e85c39 WHIRLPOOL a6351fa788faf8a27c97b9dbe04015eda13ceb529ece7d484b445c3ca2f102d2d589c3fad84e695847415c525b39f3cb599e46ac7da3b69fc7570b91b033014c
+EBUILD root-9999.ebuild 11552 SHA256 0b86a005c9bd9efe054402838d2716595972078cdaceddb0dbea63cd4726b63c SHA512 18d4d64eebe558ba6337cb83e58df8151cca4fefbbff9923d2716a3d61902757e4b38215ec5e693b738b23b9b6bdb2550316d21626558fb1ea7e560d28901d4e WHIRLPOOL c6fd1890ab67f444b6664d31923fa93a60584d7756f3e768c91c0b5566b0034d57002f78505423d0c1e4bdc3d3fef274f0090fd65b0495092ac21c5cf3c909e2
+MISC ChangeLog 32350 SHA256 5166a3f48161982ba70a56fe28a9e7f40bff9a1f3ec57815eade83a6d9027348 SHA512 454e7adc8d14c2c3e524231be0f383ece6e8cf301fd9c60eee68a5eb45bb66088bc86dfc1b74b44066feb991e7ad735ae605ae9bc2d3eb2086417ec4852f9549 WHIRLPOOL 0b3be9cbc692c18cc207cf1ade30b0ec89da83347169d2cce4902b0343792824ce502aad5f9881cb6adb37de5adaf2d317ac0efc158eb28170cbaa2870c296d6
MISC metadata.xml 1812 SHA256 59dfbbbc3106fcca42f175803f89e03c0ae82d5db3be75a88533071ebd870eab SHA512 6037cce69c96447877b8e47faced937f69af625faa857382b57e8e2e2ea6b73aab5f81a2cf6482fb97760f8ccc41429311c3dd1cdb0662c29172814c41b6e42c WHIRLPOOL c1daf8129c3e6d9905d7ded241af471b7ae076462f423c8a62a129e6782c63a12acafaa7c0b20219a32418a854d045c30612627cc1b4c6337b334573bebe7f9c
diff --git a/sci-physics/root/files/root-9999-cling.patch b/sci-physics/root/files/root-9999-cling.patch
new file mode 100644
index 000000000..9c240dd60
--- /dev/null
+++ b/sci-physics/root/files/root-9999-cling.patch
@@ -0,0 +1,13 @@
+--- root/core/utils/Module.mk.orig 2012-07-22 11:18:33.000000000 +0400
++++ root/core/utils/Module.mk 2012-07-22 11:20:02.633436297 +0400
+@@ -95,6 +95,10 @@
+ $(MAKEDIR)
+ cp $< $@
+
++$(UTILSDIRS)/%_tmp.cxx: $(UTILSDIRS)/%.cxx
++ $(MAKEDIR)
++ cp $< $@
++
+ $(call stripsrc,$(UTILSDIRS)/rootcint_tmp.o): $(call stripsrc,$(UTILSDIRS)/rootcint_tmp.cxx)
+
+ $(call stripsrc,$(UTILSDIRS)/RStl_tmp.o): $(call stripsrc,$(UTILSDIRS)/RStl_tmp.cxx)
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 4e2f20d54..af9c8ad06 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -157,7 +157,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-${PATCH_PV2}-afs.patch \
"${FILESDIR}"/${PN}-${PATCH_PV2}-cfitsio.patch \
"${FILESDIR}"/${PN}-${PATCH_PV2}-chklib64.patch \
- "${FILESDIR}"/${PN}-9999-dotfont.patch
+ "${FILESDIR}"/${PN}-9999-dotfont.patch \
+ "${FILESDIR}"/${PN}-9999-cling.patch
# make sure we use system libs and headers
rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die