Revision
118375
Author
mojca@macports.org
Date
2014-04-01 02:38:09 -0700 (Tue, 01 Apr 2014)

Log Message

clhep: a patch to avoid compile error with clang (#42841)

Modified Paths

Added Paths

Diff

Modified: trunk/dports/science/clhep/Portfile (118374 => 118375)


--- trunk/dports/science/clhep/Portfile	2014-04-01 08:18:53 UTC (rev 118374)
+++ trunk/dports/science/clhep/Portfile	2014-04-01 09:38:09 UTC (rev 118375)
@@ -31,9 +31,7 @@
     file mkdir ${configure.dir}
 }
 
-# https://savannah.cern.ch/bugs/?104110
-# https://trac.macports.org/ticket/42841
-compiler.blacklist  {clang > 503} macports-clang-3.4 macports-clang-3.5
+patchfiles          patch-CLHEP-Matrix-src-Vector.cc.diff
 
 configure.post_args ${worksrcpath}
 

Added: trunk/dports/science/clhep/files/patch-CLHEP-Matrix-src-Vector.cc.diff (0 => 118375)


--- trunk/dports/science/clhep/files/patch-CLHEP-Matrix-src-Vector.cc.diff	                        (rev 0)
+++ trunk/dports/science/clhep/files/patch-CLHEP-Matrix-src-Vector.cc.diff	2014-04-01 09:38:09 UTC (rev 118375)
@@ -0,0 +1,18 @@
+# https://savannah.cern.ch/bugs/?104110
+# https://trac.macports.org/ticket/42841
+#
+--- Matrix/src/Vector.cc.orig
++++ Matrix/src/Vector.cc
+@@ -114,9 +114,9 @@ HepVector::HepVector(const HepMatrix &hm1)
+ 
+ // trivial methods
+ 
+-inline int HepVector::num_row() const {return nrow;} 
+-inline int HepVector::num_size() const {return nrow;} 
+-inline int HepVector::num_col() const { return 1; }
++int HepVector::num_row() const {return nrow;}
++int HepVector::num_size() const {return nrow;}
++int HepVector::num_col() const { return 1; }
+ 
+ // operator()
+