diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2010-10-16 17:37:25 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-10-16 17:37:25 +0000 |
| commit | aac07d7afc5bf1c2419bdafe0b7204173c1db5ee (patch) | |
| tree | a90ee6e15f781cccf70c6dbcb97c181a03b0e1c1 /sci-physics | |
| parent | Stable for HPPA (bug #338878). (diff) | |
| download | gentoo-2-aac07d7afc5bf1c2419bdafe0b7204173c1db5ee.tar.gz gentoo-2-aac07d7afc5bf1c2419bdafe0b7204173c1db5ee.tar.bz2 gentoo-2-aac07d7afc5bf1c2419bdafe0b7204173c1db5ee.zip | |
Fix building with gmake-3.82 wrt 333083. Thanks to Diego for reporting.
(Portage version: 2.2_rc94/cvs/Linux x86_64)
Diffstat (limited to 'sci-physics')
| -rw-r--r-- | sci-physics/root/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-physics/root/files/root-5.26.00-make-3.82.patch | 36 | ||||
| -rw-r--r-- | sci-physics/root/root-5.26.00-r4.ebuild | 3 |
3 files changed, 43 insertions, 2 deletions
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index e99b35437d6d..d4cee59693ea 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-physics/root # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.73 2010/07/10 19:05:23 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.74 2010/10/16 17:37:24 xarthisius Exp $ + + 16 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org> + root-5.26.00-r4.ebuild, +files/root-5.26.00-make-3.82.patch: + Fix building with gmake-3.82 wrt 333083. Thanks to Diego for reporting. 10 Jul 2010; Raúl Porcel <armin76@gentoo.org> root-5.26.00-r2.ebuild: sparc stable wrt #318469 diff --git a/sci-physics/root/files/root-5.26.00-make-3.82.patch b/sci-physics/root/files/root-5.26.00-make-3.82.patch new file mode 100644 index 000000000000..dc6d8a0189e3 --- /dev/null +++ b/sci-physics/root/files/root-5.26.00-make-3.82.patch @@ -0,0 +1,36 @@ +http://root.cern.ch/viewcvs?view=rev&revision=35096 +https://savannah.cern.ch/bugs/?func=detailitem&item_id=72166 + +--- root-5.26.00d/Makefile ++++ root-5.26.00d/Makefile +@@ -544,6 +544,30 @@ + .PRECIOUS: include/%.h + + # special rules (need to be defined before generic ones) ++cint/cint/lib/dll_stl/G__%.o: cint/cint/lib/dll_stl/G__%.cxx ++ $(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \ ++ $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \ ++ -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $< ++ $(CXX) $(NOOPT) $(CXXFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc $(CXXOUT)$@ -c $< ++ ++cint/cint/lib/dll_stl/G__c_%.o: cint/cint/lib/dll_stl/G__c_%.c ++ $(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \ ++ $(CFLAGS) $(DICTFLAGS) -I$(CINTDIR)/lib/prec_stl \ ++ -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $< ++ $(CC) $(NOOPT) $(CFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc $(CXXOUT)$@ -c $< ++ ++cint/cint/lib/G__%.o: cint/cint/lib/G__%.cxx ++ $(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \ ++ $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \ ++ -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $< ++ $(CXX) $(NOOPT) $(CXXFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc $(CXXOUT)$@ -c $< ++ ++cint/cint/lib/G__c_%.o: cint/cint/lib/G__c_%.c ++ $(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \ ++ $(CFLAGS) $(DICTFLAGS) -I$(CINTDIR)/lib/prec_stl \ ++ -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $< ++ $(CC) $(NOOPT) $(CFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc $(CXXOUT)$@ -c $< ++ + G__%.o: G__%.cxx + $(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \ + $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \ diff --git a/sci-physics/root/root-5.26.00-r4.ebuild b/sci-physics/root/root-5.26.00-r4.ebuild index 74f3c51dba3e..d5bae6066c6c 100644 --- a/sci-physics/root/root-5.26.00-r4.ebuild +++ b/sci-physics/root/root-5.26.00-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00-r4.ebuild,v 1.4 2010/07/06 15:59:37 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00-r4.ebuild,v 1.5 2010/10/16 17:37:24 xarthisius Exp $ EAPI=3 @@ -105,6 +105,7 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}"/${P}-make-3.82.patch epatch "${WORKDIR}"/${P}-svn34137.patch epatch "${WORKDIR}"/${P}-prop-ldflags.patch epatch "${WORKDIR}"/${P}-xrootd-prop-flags.patch |