summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/pythia6/package.py1
-rw-r--r--var/spack/repos/builtin/packages/pythia6/pythia6-root.patch8
-rw-r--r--var/spack/repos/builtin/packages/pythia6/pythia6.patch13
3 files changed, 22 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/pythia6/package.py b/var/spack/repos/builtin/packages/pythia6/package.py
index 953df4405b..80a8ecce09 100644
--- a/var/spack/repos/builtin/packages/pythia6/package.py
+++ b/var/spack/repos/builtin/packages/pythia6/package.py
@@ -133,6 +133,7 @@ class Pythia6(CMakePackage):
# majority of cases. If your case is different, platform- or
# variant-based adjustments should be made.
patch('pythia6.patch', level=0)
+ patch('pythia6-root.patch', level=1, when='+root')
def patch(self):
# Use our provided CMakeLists.txt. The Makefile provided with
diff --git a/var/spack/repos/builtin/packages/pythia6/pythia6-root.patch b/var/spack/repos/builtin/packages/pythia6/pythia6-root.patch
new file mode 100644
index 0000000000..c3c6f1daac
--- /dev/null
+++ b/var/spack/repos/builtin/packages/pythia6/pythia6-root.patch
@@ -0,0 +1,8 @@
+--- rootinterface/pythia6_common_address.c.orig 2020-11-12 14:07:37.000000000 +0100
++++ rootinterface/pythia6_common_address.c 2020-11-12 14:08:54.000000000 +0100
+@@ -1,4 +1,5 @@
+ // declaration of PYTHIA6 common clocks
++# include <string.h>
+ #ifndef WIN32
+ # define pyjets pyjets_
+ # define pydat1 pydat1_
diff --git a/var/spack/repos/builtin/packages/pythia6/pythia6.patch b/var/spack/repos/builtin/packages/pythia6/pythia6.patch
index 5d45541e07..93a12a2a4e 100644
--- a/var/spack/repos/builtin/packages/pythia6/pythia6.patch
+++ b/var/spack/repos/builtin/packages/pythia6/pythia6.patch
@@ -276,3 +276,16 @@ diff -Naur upveto.f upveto.f
RETURN
END
+
+--- src/pystrf.f.orig 2014-05-14 18:12:02.000000001 +0200
++++ src/pystrf.f 2014-05-14 18:10:23.000000001 +0200
+@@ -805,7 +805,9 @@
+
+ C...Closed string: random initial breakup flavour, pT and vertex.
+ ELSE
+- KFL(3)=INT(1D0+(2D0+PARJ(2))*PYR(0))*(-1)**INT(PYR(0)+0.5D0)
++ RNDM1=PYR(0)
++ RNDM2=PYR(0)
++ KFL(3)=INT(1D0+(2D0+PARJ(2))*RNDM1)*(-1)**INT(RNDM2+0.5D0)
+ IBMO=0
+ 770 CALL PYKFDI(KFL(3),0,KFL(1),KDUMP)
+ C.. Closed string: first vertex diq attempt => enforced second