diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec index 075361c7e13..a391617b232 100644 --- a/cmssw-tool-conf.spec +++ b/cmssw-tool-conf.spec @@ -40,14 +40,12 @@ Requires: hector Requires: hepmc Requires: hepmc3 Requires: heppdt -Requires: herwig Requires: herwig7 Requires: hydjet Requires: hydjet2 Requires: ittnotify Requires: jemalloc Requires: jemalloc-debug -Requires: jimmy Requires: json Requires: ktjet Requires: lhapdf diff --git a/herwig-6.520-tauoladummy.patch b/herwig-6.520-tauoladummy.patch deleted file mode 100644 index 7a5ccc0d6d3..00000000000 --- a/herwig-6.520-tauoladummy.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- orig.herwig/6.520/dummy/Makefile.am 2010-10-28 17:52:56.000000000 +0200 -+++ herwig/6.520/dummy/Makefile.am 2010-10-28 17:54:15.000000000 +0200 -@@ -3,20 +3,13 @@ - circes.f \ - circgg.f \ - decadd.f \ --dexay.f \ - eudini.f \ - fragmt.f \ - hvcbvi.f \ - hvhbvi.f \ - hwhvvj.f \ - ieupdg.f \ --inietc.f \ --inimas.f \ --iniphx.f \ --initdk.f \ - ipdgeu.f \ --phoini.f \ --photos.f \ - qqinit.f \ - timel.f \ - upevnt.f \ ---- orig.herwig/6.520/dummy/Makefile.in 2010-10-28 17:52:56.000000000 +0200 -+++ herwig/6.520/dummy/Makefile.in 2010-10-28 19:33:19.000000000 +0200 -@@ -57,10 +57,9 @@ - libLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(lib_LTLIBRARIES) - libherwig_dummy_la_LIBADD = --am__objects_1 = circee.lo circes.lo circgg.lo decadd.lo dexay.lo \ -+am__objects_1 = circee.lo circes.lo circgg.lo decadd.lo \ - eudini.lo fragmt.lo hvcbvi.lo hvhbvi.lo hwhvvj.lo ieupdg.lo \ -- inietc.lo inimas.lo iniphx.lo initdk.lo ipdgeu.lo phoini.lo \ -- photos.lo qqinit.lo timel.lo upevnt.lo upinit.lo -+ ipdgeu.lo qqinit.lo timel.lo upevnt.lo upinit.lo - am_libherwig_dummy_la_OBJECTS = $(am__objects_1) - libherwig_dummy_la_OBJECTS = $(am_libherwig_dummy_la_OBJECTS) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config -@@ -176,20 +175,13 @@ - circes.f \ - circgg.f \ - decadd.f \ --dexay.f \ - eudini.f \ - fragmt.f \ - hvcbvi.f \ - hvhbvi.f \ - hwhvvj.f \ - ieupdg.f \ --inietc.f \ --inimas.f \ --iniphx.f \ --initdk.f \ - ipdgeu.f \ --phoini.f \ --photos.f \ - qqinit.f \ - timel.f \ - upevnt.f \ diff --git a/herwig.spec b/herwig.spec deleted file mode 100644 index f87ee531182..00000000000 --- a/herwig.spec +++ /dev/null @@ -1,40 +0,0 @@ -### RPM external herwig 6.521 -Source: http://cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-%{realversion}-src.tgz -Requires: lhapdf photos -Patch1: herwig-6.520-tauoladummy - -%define keep_archives true - -%prep -%setup -q -n %n/%{realversion} -F77="$(which gfortran) -fPIC" -PLATF_CONFIG_OPTS="--disable-shared --enable-static" - -%patch1 -p2 - -# Update to detect aarch64 and ppc64le -rm -f ./config/config.{sub,guess} -%get_config_sub ./config/config.sub -%get_config_guess ./config/config.guess -chmod +x ./config/config.{sub,guess} - -./configure $PLATF_CONFIG_OPTS --prefix=%i F77="$F77" - -%build -make %{makeprocesses} LHAPDF_ROOT=$LHAPDF_ROOT PHOTOS_ROOT=$PHOTOS_ROOT - -make check - -%install -make install - -# then hack include area as jimmy depends on missing header file.. -# but only on slc*. On macosx HERWIG65.INC == herwig65.inc -# what is actually needed is a link to herwig6510.inc -%ifos darwin -ln -sf herwig6521.inc %{i}/include/herwig65.inc -%else -ln -sf HERWIG65.INC %{i}/include/herwig65.inc -%endif - -rm -rf %i/lib/*.la diff --git a/jimmy-4.2-configure-update.patch b/jimmy-4.2-configure-update.patch deleted file mode 100644 index ddfca47915d..00000000000 --- a/jimmy-4.2-configure-update.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/4.2/configure b/4.2/configure -index fa2cbb5..1f82871 100755 ---- a/4.2/configure -+++ b/4.2/configure -@@ -82,7 +82,7 @@ check_arguments $* - #fi - #Platform & opt/dbg - independent flags and variables: - --export FFLAGS="${FFLAGS} -Wno-globals" -+export FFLAGS="${FFLAGS}" - - FFLAGSSHARED=-fPIC - CFLAGSSHARED=-fPIC -@@ -92,17 +92,17 @@ CFLAGSSHARED=-fPIC - export LDFLAGS=" -pthread -fPIC" - - ARCH=`uname` --if [ ${ARCH} = "Linux" ]; then -- export F77=g77 -- export FLIBS=" -lfrtbegin -lg2c " --elif [ ${ARCH} = "Linux-gcc4" ]; then # Linux platform with gcc4: new Fortran90 compiler. -- export F77=gfortran -- export FLIBS=" -lgfortran -lgfortranbegin " --else -- echo "Warning: unknown ARCH = $ARCH. Setting F77=f77, FLIBS=\"\"" -- export F77=f77 -- export FLIBS="" --fi -+case ${ARCH} in -+ Linux) -+ export F77=gfortran -+ export FLIBS=" -lgfortran -lgfortranbegin " -+ ;; -+ *) -+ echo "Warning: unknown ARCH = $ARCH. Setting F77=f77, FLIBS=\"\"" -+ export F77=f77 -+ export FLIBS="" -+ ;; -+esac - - echo "Assuming the fortran compiler to be ... "$F77 - -diff --git a/4.2/src/Makefile b/4.2/src/Makefile -index 5d52ef0..0e9d2d2 100644 ---- a/4.2/src/Makefile -+++ b/4.2/src/Makefile -@@ -19,7 +19,13 @@ lib_archive: $(LIB_ARCHIVE) - $(LIB_SHARED): $(objects) - mkdir -p $(LIBDIR_SHARED) - @echo creating the shared library $@ -- $(F77) $(LDFLAGSSHARED) $(objects) -o $@ -shared -Wl,-soname,$(notdir $@) -+ case `uname` in \ -+ Linux*) \ -+ $(F77) $(LDFLAGSSHARED) $(objects) -o $@ -shared -Wl,-soname,$(notdir $@) ;; \ -+ Darwin*) \ -+ $(F77) $(LDFLAGSSHARED) $(objects) -L$(HERWIG_ROOT)/lib -lherwig -o $@ -shared -dynamic -Wl,-commons -Wl,use_dylibs ;; \ -+ esac -+ - - $(LIB_ARCHIVE) : $(objects) - mkdir -p $(LIBDIR_ARCHIVE) diff --git a/jimmy.spec b/jimmy.spec deleted file mode 100644 index edaf36e9bda..00000000000 --- a/jimmy.spec +++ /dev/null @@ -1,25 +0,0 @@ -### RPM external jimmy 4.2 - -Requires: herwig -Source: http://service-spi.web.cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-%{realversion}-src.tgz -Patch0: jimmy-4.2-configure-update - -%define keep_archives true - -%prep -%setup -q -n %{n}/%{realversion} -%patch0 -p2 - -%build -./configure $PLATF_CONFIG_OPTS --with-herwig=$HERWIG_ROOT -# Looks like ./configure does not do all it should do to have our -# version of herwig picked up at link time. -# Workaround until they fix the GENESER makefiles is to define -# the variable and use it directly inside "Makeshared". -make HERWIG_ROOT=$HERWIG_ROOT FFLAGS=-std=legacy lib_archive - -%install -tar -c lib include | tar -x -C %i -find %i/lib/archive -name "*.a" -exec mv {} %i/lib \; -rm -rf %i/lib/archive - diff --git a/scram-tools.file/tools/herwig/herwig.xml b/scram-tools.file/tools/herwig/herwig.xml deleted file mode 100644 index 62f1aa0ba75..00000000000 --- a/scram-tools.file/tools/herwig/herwig.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/scram-tools.file/tools/jimmy/jimmy.xml b/scram-tools.file/tools/jimmy/jimmy.xml deleted file mode 100644 index 1fc0280c940..00000000000 --- a/scram-tools.file/tools/jimmy/jimmy.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/scram-tools.file/tools/jimmy/jimmy_headers.xml b/scram-tools.file/tools/jimmy/jimmy_headers.xml deleted file mode 100644 index a68d77429b8..00000000000 --- a/scram-tools.file/tools/jimmy/jimmy_headers.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - -