diff --git a/cascade-2.2.0-nomanual.patch b/cascade-2.2.0-nomanual.patch deleted file mode 100644 index 0c5064f95b3..00000000000 --- a/cascade-2.2.0-nomanual.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- orig.cascade/2.2.0/Makefile.in 2010-08-05 18:13:21.000000000 +0200 -+++ cascade/2.2.0/Makefile.in 2010-09-30 15:49:04.000000000 +0200 -@@ -195,7 +195,7 @@ - #endif - MAYBE_OPT = - #SUBDIRS = include bases51 misc src $(MAYBE_OPT) data manual --SUBDIRS = include misc bases51 src $(MAYBE_OPT) data manual -+SUBDIRS = include misc bases51 src $(MAYBE_OPT) data - - #dist_doc_DATA = README - EXTRA_DIST = README history.txt diff --git a/cascade-2.2.04-drop-dcasrn.patch b/cascade-2.2.04-drop-dcasrn.patch deleted file mode 100644 index 5094bf8ea1a..00000000000 --- a/cascade-2.2.04-drop-dcasrn.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/src/dcasrn.F b/src/dcasrn.F -index f707c72..61be44c 100644 ---- a/src/dcasrn.F -+++ b/src/dcasrn.F -@@ -1,20 +1,3 @@ -- DOUBLE PRECISION FUNCTION dcasrn(i) -- -- DOUBLE PRECISION DR(1) -- DOUBLE PRECISION TWOM24 -- PARAMETER (TWOM24 = 2.D0**(-24)) -- Real Rvec(2) -- Integer i -- CALL RANLUX(RVEC,2) -- DR(1) = DBLE (RVEC(1)) + DBLE (RVEC(2)) * TWOM24 --c CALL RM48 (DR,1) -- dcasrn = DR(1) -- -- -- RETURN -- END -- -- - SUBROUTINE dcasrnv(RVEC,LENV) - - Integer lenv,I -diff --git a/src/Makefile.in b/src/Makefile.in -index 2f2d255..5aed8f2 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -37,7 +37,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --bin_PROGRAMS = cascade$(EXEEXT) -+bin_PROGRAMS = - subdir = src - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/cascade-2.2.04-getenv.patch b/cascade-2.2.04-getenv.patch deleted file mode 100644 index 6dfb6db2455..00000000000 --- a/cascade-2.2.04-getenv.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- orig.cascade/2.2.04/src/casini.F 2010-10-31 15:20:03.000000000 +0100 -+++ cascade/2.2.04/src/casini.F 2011-11-12 16:33:02.000000000 +0100 -@@ -59,9 +59,9 @@ - c IGLU=5 --> GBW - c IGLU=6 --> KMR - c IGLU=6 --> RS -- call getenv('PDFPATH',pdfpath) -+ call getenv('CASCADE_PDFPATH',pdfpath) - if(pdfpath.ne.'') then -- call getenv('PDFPATH',pdfpath) -+ call getenv('CASCADE_PDFPATH',pdfpath) - else - PDFPATH='../share/' - endif diff --git a/cascade.spec b/cascade.spec deleted file mode 100644 index ba65e36e26c..00000000000 --- a/cascade.spec +++ /dev/null @@ -1,51 +0,0 @@ -### RPM external cascade 2.2.04 - -Source: http://cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-%{realversion}-src.tgz -Patch0: cascade-2.2.0-nomanual -Patch1: cascade-2.2.04-getenv -# Drop dcasrn symbol, which we need to redifine in CMSSW. Do not build cascade -# executable, since it would use the wrong symbol in anycase. -Patch2: cascade-2.2.04-drop-dcasrn -Requires: lhapdf pythia6 - -%define keep_archives true - -%prep -rm -rf %{n} -%setup -q -n %{n}/%{realversion} -%patch0 -p2 -%patch1 -p2 -%patch2 -p1 - -# Notice that cascade expects a flat pythia installation, -# where libraries and headers are all in the same place. -# Since the source code is not actually needed, we point -# it to the library location so that it links correctly. -PYTHIA="$PYTHIA6_ROOT" -LHAPDF="$LHAPDF_ROOT" -GCC10_FFLAGS="" -if [[ `gcc --version | head -1 | cut -d' ' -f3 | cut -d. -f1,2,3 | tr -d .` -gt 1000 ]] ; then GCC10_FFLAGS="-fallow-argument-mismatch" ; fi -F77="$(which gfortran) -fPIC $GCC10_FFLAGS" -PLATF_CONFIG_OPTS="--enable-static --disable-shared" -LIBS="-lstdc++ -lz" - -# Update to detect aarch64 and ppc64le -rm -f ./config.{sub,guess} -%get_config_sub ./config.sub -%get_config_guess ./config.guess -chmod +x ./config.{sub,guess} - -./configure $PLATF_CONFIG_OPTS --with-pythia6=$PYTHIA --with-lhapdf=$LHAPDF --prefix=%i F77="$F77" LIBS="$LIBS" -%build -make %makeprocesses - -%install -make install - -# In case we build archive libraries we need to merge all of them, because -# otherwise that results some missing symbol due to a circular dependency among -# them which cannot be solved by reshuffling the various -l statements. -cd %{i}/lib -find . -name '*.a' -exec ar -x {} \; -ar rcs libcascade_merged.a *.o -rm -rf *.o diff --git a/charybdis-1.003-archive-only.patch b/charybdis-1.003-archive-only.patch deleted file mode 100644 index c5352116319..00000000000 --- a/charybdis-1.003-archive-only.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/charybdis/1.003/Makefile b/charybdis/1.003/Makefile -index d4cbdd0..a9f0690 100644 ---- a/charybdis/1.003/Makefile -+++ b/charybdis/1.003/Makefile -@@ -53,10 +53,6 @@ libs: - export LIBNAME ; export DIRNAME ; \ - $(MAKE) -f Makearchive.subdir - -- @LIBNAME=$(LIBDIR)/libcharybdis.so ; DIRNAME=src ; \ -- export LIBNAME ; export DIRNAME ; \ -- $(MAKE) -f Makeshared.subdir -- - clean: - rm -f *~; rm -f \#*; - rm -rf $(TMPDIR) diff --git a/charybdis-1003-macosx.patch b/charybdis-1003-macosx.patch deleted file mode 100644 index dbe4fe14170..00000000000 --- a/charybdis-1003-macosx.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/charybdis/1.003/configure b/charybdis/1.003/configure -index 1818d4d..da228cd 100755 ---- a/charybdis/1.003/configure -+++ b/charybdis/1.003/configure -@@ -121,23 +121,25 @@ if [ $ARCH = Linux ]; then - fi - fi - # Linux platform with gcc4: new Fortran90 compiler. --if [ $ARCH = Linux-gcc4 ]; then -- export FC=gfortran -- export FFLAGS="${FFLAGS_OPT}" -- export CFLAGS="${CFLAGS_OPT}" -- export CXXFLAGS="${CXXFLAGS_OPT}" -- export FLIBS="-lgfortran -lgfortranbegin" -- if [ ${COMPMODE} = OPT ]; then -- export FFLAGS="${FFLAGS_OPT}" -- export CFLAGS="${CFLAGS_OPT}" -- export CXXFLAGS="${CXXFLAGS_OPT}" -- fi -- if [ ${COMPMODE} = DBG ]; then -- export FFLAGS="${FFLAGS_DBG}" -- export CFLAGS="${CFLAGS_DBG}" -- export CXXFLAGS="${CXXFLAGS_DBG}" -- fi --fi -+case $ARCH in -+ *-gcc4) -+ export FC=gfortran -+ export FFLAGS="${FFLAGS_OPT}" -+ export CFLAGS="${CFLAGS_OPT}" -+ export CXXFLAGS="${CXXFLAGS_OPT}" -+ export FLIBS="-lgfortran -lgfortranbegin" -+ if [ ${COMPMODE} = OPT ]; then -+ export FFLAGS="${FFLAGS_OPT}" -+ export CFLAGS="${CFLAGS_OPT}" -+ export CXXFLAGS="${CXXFLAGS_OPT}" -+ fi -+ if [ ${COMPMODE} = DBG ]; then -+ export FFLAGS="${FFLAGS_DBG}" -+ export CFLAGS="${CFLAGS_DBG}" -+ export CXXFLAGS="${CXXFLAGS_DBG}" -+ fi -+ ;; -+esac - - #Platform & opt/dbg - independent flags and variables: - -diff --git a/charybdis/1.003/Makeshared.subdir b/charybdis/1.003/Makeshared.subdir -index 102c2fc..1d38460 100644 ---- a/charybdis/1.003/Makeshared.subdir -+++ b/charybdis/1.003/Makeshared.subdir -@@ -42,7 +42,13 @@ objects += $(patsubst $(DIRNAME)/%.c,$(TMPDIR)/%.o,$(wildcard $(DIRNAME)/*.c)) - $(LIBNAME): $(objects) - @mkdir -p $(LIBDIR) - @echo creating the shared library $@ -- $(CXX) $(LDFLAGSSHARED) $(objects) -o $@ -shared -Wl,-soname,$(notdir $@) -+ case ${ARCH} in \ -+ Linux-*) \ -+ $(CXX) $(LDFLAGSSHARED) $(objects) -o $@ -shared -Wl,-soname,$(notdir $@) \ -+ ;; \ -+ Darwin-*) \ -+ $(CXX) $(LDFLAGSSHARED) $(objects) -o $@ -Wl,-commons -Wl,use_dylibs -shared -L$(PYTHIA6_ROOT)/lib -lpythia6 -L$(LHAPDF_ROOT)/lib -lLHAPDF -L$(ZLIB_ROOT)/lib -lz $(shell gfortran --print-file-name=libgfortran.a) -dynamic ;; \ -+ esac - - deps := $(patsubst $(DIRNAME)/%.F,$(TMPDIR)/%.d,$(wildcard $(DIRNAME)/*.F)) - diff --git a/charybdis.spec b/charybdis.spec deleted file mode 100644 index 707c67e9191..00000000000 --- a/charybdis.spec +++ /dev/null @@ -1,31 +0,0 @@ -### RPM external charybdis 1.003 -Source: http://cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-%{realversion}-src.tgz -Patch0: charybdis-1003-macosx -Patch1: charybdis-1.003-archive-only - -Requires: pythia6 -Requires: lhapdf -Requires: zlib - -%define keep_archives true - -%prep -%setup -q -n %{n}/%{realversion} -%patch0 -p3 -# On osx we build only the archive libraries to avoid issues with the common -# blocks. -case %cmsos in - osx*) -%patch1 -p3 - ;; -esac -./configure --lcgplatform=%cmsplatf --pythia_hadronization - -%build -make FC="`which gfortran` -fPIC" PYTHIA6_ROOT=$PYTHIA6_ROOT LHAPDF_ROOT=$LHAPDF_ROOT ZLIB_ROOT=$ZLIB_ROOT - -%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/cmssw-tool-conf.spec b/cmssw-tool-conf.spec index 8f8b212fa87..7e13024a700 100644 --- a/cmssw-tool-conf.spec +++ b/cmssw-tool-conf.spec @@ -12,7 +12,6 @@ Requires: starlight Requires: alpgen Requires: boost Requires: bz2lib -Requires: charybdis Requires: classlib Requires: clhep Requires: coral @@ -40,14 +39,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 @@ -59,7 +56,6 @@ Requires: libxml2 Requires: lwtnn Requires: meschach Requires: pcre2 -Requires: photos Requires: photospp Requires: pyquen Requires: pythia6 @@ -76,10 +72,8 @@ Requires: ucx Requires: openmpi Requires: sigcpp Requires: sqlite -Requires: tauola Requires: tauolapp Requires: thepeg -Requires: toprex Requires: libuuid Requires: xerces-c Requires: dcap @@ -96,7 +90,6 @@ Requires: grpc Requires: onnxruntime Requires: triton-inference-client Requires: hdf5 -Requires: cascade Requires: yoda Requires: fftw3 Requires: fftjet 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/photos-215.5-update-configure.patch b/photos-215.5-update-configure.patch deleted file mode 100644 index bc136cef449..00000000000 --- a/photos-215.5-update-configure.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/215.5/Makefile b/215.5/Makefile -index 648424f..73b5dce 100644 ---- a/215.5/Makefile -+++ b/215.5/Makefile -@@ -11,6 +11,8 @@ SHELL = /bin/sh - # - FFLAGSSHARED = -fPIC - CFLAGSSHARED = -fPIC -+FFLAGS = -fPIC -+CFLAGS = -fPIC - # - LDFLAGSSHARED = $(CXXFLAGS) -pthread -fPIC - -diff --git a/215.5/Makeshared.subdir b/215.5/Makeshared.subdir -index f167145..0a8f232 100644 ---- a/215.5/Makeshared.subdir -+++ b/215.5/Makeshared.subdir -@@ -42,7 +42,14 @@ objects += $(patsubst $(DIRNAME)/%.c,$(TMPDIR)/%.o,$(wildcard $(DIRNAME)/*.c)) - $(LIBNAME): $(objects) - @mkdir -p $(LIBDIR) - @echo creating the shared library $@ -- $(CXX) $(LDFLAGSSHARED) $(objects) -o $@ -shared -Wl,-soname,$(notdir $@) -+ case ${ARCH} in \ -+ Linux-*) \ -+ $(CXX) $(LDFLAGSSHARED) $(objects) -o $@ -shared -Wl,-soname,$(notdir $@) \ -+ ;;\ -+ Darwin-*) \ -+ $(CXX) $(LDFLAGSSHARED) $(objects) -Wl,-commons,use_dylibs -o $@ -shared -L$(dir $(shell gfortran --print-file-name=libgfortran.a)) $(FLIBS) -dynamic \ -+ ;; \ -+ esac - - deps := $(patsubst $(DIRNAME)/%.F,$(TMPDIR)/%.d,$(wildcard $(DIRNAME)/*.F)) - -diff --git a/215.5/configure b/215.5/configure -index c8382cc..105950e 100755 ---- a/215.5/configure -+++ b/215.5/configure -@@ -74,10 +74,6 @@ export CXXFLAGS_DBG="-g -ansi -pedantic -W -Wall" - # Find platform. - # - export ARCH="`uname`" --export theGcc=`g++ --version | head -n 1 | awk '{print$3}' | awk -F . '{print $1}'` --if [ ${theGcc} = 4 ]; then -- export ARCH=${ARCH}-gcc4 --fi - echo Platform is $ARCH - - #default platform settings: -@@ -98,24 +94,6 @@ if [ ${COMPMODE} = DBG ]; then - export CXXFLAGS="${CXXFLAGS_DBG}" - fi - if [ $ARCH = Linux ]; then -- export FC=g77 -- export FFLAGS="${FFLAGS_OPT} -Wno-globals" -- export CFLAGS="${CFLAGS_OPT}" -- export CXXFLAGS="${CXXFLAGS_OPT}" -- export FLIBS="-lfrtbegin -lg2c" -- if [ ${COMPMODE} = OPT ]; then -- export FFLAGS="${FFLAGS_OPT}" -- export CFLAGS="${CFLAGS_OPT}" -- export CXXFLAGS="${CXXFLAGS_OPT}" -- fi -- if [ ${COMPMODE} = DBG ]; then -- export FFLAGS="${FFLAGS_DBG} -Wno-globals" -- export CFLAGS="${CFLAGS_DBG}" -- export CXXFLAGS="${CXXFLAGS_DBG}" -- fi --fi --# Linux platform with gcc4: new Fortran90 compiler. --if [ $ARCH = Linux-gcc4 ]; then - export FC=gfortran - export FFLAGS="${FFLAGS_OPT}" - export CFLAGS="${CFLAGS_OPT}" diff --git a/photos.spec b/photos.spec deleted file mode 100644 index 52e49eea4d5..00000000000 --- a/photos.spec +++ /dev/null @@ -1,23 +0,0 @@ -### RPM external photos 215.5 - -Source: http://cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-%{realversion}-src.tgz -Patch0: photos-215.5-update-configure -%define keep_archives true - -%prep -%setup -q -n %{n}/%{realversion} -%patch0 -p2 - -%build -PLATF_CONFIG_OPTS="--enable-static --disable-shared" -./configure --lcgplatform=%cmsplatf $PLATF_CONFIG_OPTS -%ifos darwin -perl -p -i -e "s|libphotos.so|libphotos.dylib|g" Makefile ;; -%endif -make - -%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/cascade/cascade.xml b/scram-tools.file/tools/cascade/cascade.xml deleted file mode 100644 index 99cacc8e42c..00000000000 --- a/scram-tools.file/tools/cascade/cascade.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/scram-tools.file/tools/cascade/cascade_headers.xml b/scram-tools.file/tools/cascade/cascade_headers.xml deleted file mode 100644 index 1a8a2c44133..00000000000 --- a/scram-tools.file/tools/cascade/cascade_headers.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/scram-tools.file/tools/charybdis/charybdis.xml b/scram-tools.file/tools/charybdis/charybdis.xml deleted file mode 100644 index 8a2b2182754..00000000000 --- a/scram-tools.file/tools/charybdis/charybdis.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - 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 @@ - - - - - - - - diff --git a/scram-tools.file/tools/photos/photos.xml b/scram-tools.file/tools/photos/photos.xml deleted file mode 100644 index 636110eca27..00000000000 --- a/scram-tools.file/tools/photos/photos.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/scram-tools.file/tools/photos/photos_headers.xml b/scram-tools.file/tools/photos/photos_headers.xml deleted file mode 100644 index 3adba9ffaf9..00000000000 --- a/scram-tools.file/tools/photos/photos_headers.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/scram-tools.file/tools/tauola/tauola.xml b/scram-tools.file/tools/tauola/tauola.xml deleted file mode 100644 index bf3a3801bd8..00000000000 --- a/scram-tools.file/tools/tauola/tauola.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/scram-tools.file/tools/tauola/tauola_headers.xml b/scram-tools.file/tools/tauola/tauola_headers.xml deleted file mode 100644 index 2f8a2c528aa..00000000000 --- a/scram-tools.file/tools/tauola/tauola_headers.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/scram-tools.file/tools/toprex/toprex.xml b/scram-tools.file/tools/toprex/toprex.xml deleted file mode 100644 index ec7a77fd723..00000000000 --- a/scram-tools.file/tools/toprex/toprex.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/scram-tools.file/tools/toprex/toprex_headers.xml b/scram-tools.file/tools/toprex/toprex_headers.xml deleted file mode 100644 index 7b0de660589..00000000000 --- a/scram-tools.file/tools/toprex/toprex_headers.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/tauola-27.121-gfortran-tauola-srs.patch b/tauola-27.121-gfortran-tauola-srs.patch deleted file mode 100644 index 0f6bff202d4..00000000000 --- a/tauola-27.121-gfortran-tauola-srs.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- orig.tauola/27.121.5/pretauola/tauola_srs.F 2010-09-17 13:59:09.000000000 +0200 -+++ tauola/27.121.5/pretauola/tauola_srs.F 2010-09-22 11:07:54.000000000 +0200 -@@ -243,6 +243,9 @@ - ELSEIF ((IMOTH.EQ.IM0.OR.IMOTH.EQ.IM).AND.ISEL.EQ.0) THEN - ISON(2)=I - ELSEIF ((IMOTH.NE.IM0.AND.IMOTH.NE.IM).AND.ISEL.EQ.0) THEN -+ IF( IDHEP(I).EQ.22. AND. JMOHEP(1,I).LT.IM0 ) THEN -+ IF(ABS(IDHEP(JMOHEP(1,I))).NE.KFTAU) GOTO 76 -+ ENDIF - ISEL=1 - GOTO 77 - ENDIF diff --git a/tauola-27.121.5-configure-makefile-update.patch b/tauola-27.121.5-configure-makefile-update.patch deleted file mode 100644 index 1b2382534d4..00000000000 --- a/tauola-27.121.5-configure-makefile-update.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff --git a/27.121.5/Makefile b/27.121.5/Makefile -index acb9e77..3f89fda 100644 ---- a/27.121.5/Makefile -+++ b/27.121.5/Makefile -@@ -50,20 +50,12 @@ all: libs - libs: - @echo FFLAGS_tauola = $(FFLAGS_tauola) - -- @LIBNAME=$(LIBDIR)/libtauola.so ; DIRNAME=src ; FFLAGS="$(FFLAGS_tauola)" ; \ -- export LIBNAME ; export DIRNAME ; export FFLAGS; \ -- $(MAKE) -f Makeshared.subdir -- - @LIBNAME=$(LIBDIR)/archive/libtauola.a ; DIRNAME=src ; FFLAGS="$(FFLAGS_tauola)" ; \ - export LIBNAME ; export DIRNAME ; export FFLAGS; \ - $(MAKE) -f Makearchive.subdir - - @echo FFLAGS_pretauola = $(FFLAGS_pretauola) - -- @LIBNAME=$(LIBDIR)/libpretauola.so ; DIRNAME=pretauola ; FFLAGS="$(FFLAGS_pretauola)" ; \ -- export LIBNAME ; export DIRNAME ; export FFLAGS; \ -- $(MAKE) -f Makeshared.subdir -- - @LIBNAME=$(LIBDIR)/archive/libpretauola.a ; DIRNAME=pretauola ; FFLAGS="$(FFLAGS_pretauola)" ; \ - export LIBNAME ; export DIRNAME ; export FFLAGS; \ - $(MAKE) -f Makearchive.subdir -diff --git a/27.121.5/Makeshared.subdir b/27.121.5/Makeshared.subdir -index cfb17bf..032c841 100644 ---- a/27.121.5/Makeshared.subdir -+++ b/27.121.5/Makeshared.subdir -@@ -42,9 +42,9 @@ $(TMPDIR)/%.o : $(DIRNAME)/%.c - # Creating the dependency files *.d - - $(TMPDIR)/%.d : $(DIRNAME)/%.F -- @echo Making dependency for file $<; \ -+ echo Making dependency for file $<; \ - mkdir -p $(TMPDIR); \ -- $(CC) -M -I$(INCDIR) $< | \ -+ $(FC) -M -I$(INCDIR) $< | \ - sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' | \ - sed 's/$*.o/$(TMPDIR)\/$*.o/' > $@; \ - [ -s $@ ] || rm -f $@ -@@ -57,12 +57,24 @@ ifeq ($(PYTHIA6FORSHAREDLIBS),) - $(LIBNAME): $(objects) - @mkdir -p $(LIBDIR) - @echo creating the shared library $@ -- $(CXX) $(LDFLAGSSHARED) $(objects) -o $@ -shared -Wl,-soname,$(notdir $@) -+ case $ARCH in \ -+ Linux*) \ -+ $(CXX) $(LDFLAGSSHARED) $(objects) -o $@ -shared -Wl,-soname,$(notdir $@) ;; \ -+ Darwin*) \ -+ $(CXX) $(LDFLAGSSHARED) $(objects) -o $@ -shared -dynamic ;; \ -+ esac - else - $(LIBNAME): $(objects) - @mkdir -p $(LIBDIR) - @echo creating the shared library $@ -- $(CXX) $(LDFLAGSSHARED) $(objects) -o $@ -shared -Wl,-soname,$(notdir $@) -L$(PYTHIA6FORSHAREDLIBS) -l$(PYTHIA6LIBNAMEFORSHAREDLIBS) -+ case ${ARCH} in \ -+ Linux*) \ -+ $(CXX) $(LDFLAGSSHARED) $(objects) -o $@ -shared -Wl,-soname,$(notdir $@) -L$(PYTHIA6FORSHAREDLIBS) -l$(PYTHIA6LIBNAMEFORSHAREDLIBS) \ -+ ;; \ -+ Darwin*) \ -+ $(CXX) $(LDFLAGSSHARED) $(objects) -o $@ -shared -dynamic -Wl,-commons,use_dylibs $(shell echo $@ | grep pretauola >/dev/null && echo lib/libtauola.dylib) -L$(PYTHIA6FORSHAREDLIBS) -l$(PYTHIA6LIBNAMEFORSHAREDLIBS) -L$(PHOTOS_ROOT)/lib -lphotos $(shell gfortran --print-file-name=libgfortran.a) \ -+ ;; \ -+ esac - endif - - deps := $(patsubst $(DIRNAME)/%.F,$(TMPDIR)/%.d,$(wildcard $(DIRNAME)/*.F)) -diff --git a/27.121.5/configure b/27.121.5/configure -index 960e5e2..7223826 100755 ---- a/27.121.5/configure -+++ b/27.121.5/configure -@@ -99,11 +99,6 @@ export CXXFLAGS_DBG="-g -ansi -pedantic -W -Wall" - # Find platform. - - export ARCH="`uname`" --export theGcc1=`g++ --version | awk '{print$3}'` --export theGcc=`echo ${theGcc1} | awk -F . '{print $1}'` --if [ ${theGcc} = 4 ]; then -- export ARCH=${ARCH}-gcc4 --fi - echo Platform is $ARCH - - #default platform settings: -@@ -124,24 +119,6 @@ if [ ${COMPMODE} = DBG ]; then - export CXXFLAGS="${CXXFLAGS_DBG}" - fi - if [ $ARCH = Linux ]; then -- export FC=g77 -- export FFLAGS="${FFLAGS_OPT} -Wno-globals" -- export CFLAGS="${CFLAGS_OPT}" -- export CXXFLAGS="${CXXFLAGS_OPT}" -- export FLIBS="-lfrtbegin -lg2c" -- if [ ${COMPMODE} = OPT ]; then -- export FFLAGS="${FFLAGS_OPT}" -- export CFLAGS="${CFLAGS_OPT}" -- export CXXFLAGS="${CXXFLAGS_OPT}" -- fi -- if [ ${COMPMODE} = DBG ]; then -- export FFLAGS="${FFLAGS_DBG} -Wno-globals" -- export CFLAGS="${CFLAGS_DBG}" -- export CXXFLAGS="${CXXFLAGS_DBG}" -- fi --fi --# Linux platform with gcc4: new Fortran90 compiler. --if [ $ARCH = Linux-gcc4 ]; then - export FC=gfortran - export FFLAGS="${FFLAGS_OPT}" - export CFLAGS="${CFLAGS_OPT}" diff --git a/tauola-27.121.5-gfortran-taueta.patch b/tauola-27.121.5-gfortran-taueta.patch deleted file mode 100644 index 5c3ac6e4a87..00000000000 --- a/tauola-27.121.5-gfortran-taueta.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/27.121.5/src/taueta.F b/27.121.5/src/taueta.F -index 15cd088..a82149d 100644 ---- a/27.121.5/src/taueta.F -+++ b/27.121.5/src/taueta.F -@@ -43,7 +43,7 @@ c - REAL PHOT1(4),PHOT2(4),PHOT3(4) - REAL*8 X(4), Y(4), Z(4) - REAL YM1,YM2,YM3 -- REAL*8 R,RU,PETA(4),XM1,XM2,XM3,XM,XLAM -+ REAL*8 R,RU,PETA(4),XM1,XM2,XM3,XM,AM2,XLAM - REAL*8 a,b,c - REAL*8 AM2 - XLAM(a,b,c)=SQRT(ABS((a-b-c)**2-4.0*b*c)) -diff --git a/27.121.5/src/taueta.F b/27.121.5/src/taueta.F -index a82149d..ced7f80 100644 ---- a/27.121.5/src/taueta.F -+++ b/27.121.5/src/taueta.F -@@ -45,7 +45,6 @@ c - REAL YM1,YM2,YM3 - REAL*8 R,RU,PETA(4),XM1,XM2,XM3,XM,AM2,XLAM - REAL*8 a,b,c -- REAL*8 AM2 - XLAM(a,b,c)=SQRT(ABS((a-b-c)**2-4.0*b*c)) - C position of decaying particle: - IF((KTO.EQ. 1).OR.(KTO.EQ.11)) THEN diff --git a/tauola.spec b/tauola.spec deleted file mode 100644 index 245057344d7..00000000000 --- a/tauola.spec +++ /dev/null @@ -1,35 +0,0 @@ -### RPM external tauola 27.121.5 -Source: http://cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-%{realversion}-src.tgz -Patch1: tauola-27.121.5-gfortran-taueta -Patch2: tauola-27.121-gfortran-tauola-srs -Patch3: tauola-27.121.5-configure-makefile-update -# Notice that on macosx we don't build shared libraries, so the following -# requires are not really mandatory, but we keep them for consistency with the -# linux build. -Requires: pythia6 -Requires: photos - -%define keep_archives true - -%prep -%setup -q -n %{n}/%{realversion} -# Remove options by hand since it looks like they have -# the bad habit of republishing sources. -perl -p -i -e 's|-fno-globals||g;s|-finit-local-zero||g;s|-fugly-logint||g;s|-fugly-complex||' configure -# Removed since this appears to have already been applied in the new tarball... -# Sigh... -%patch1 -p2 -%patch2 -p2 -%patch3 -p2 - -FC="$(which gfortran) -fPIC" -./configure --lcgplatform=%cmsplatf --with-pythia6libs=$PYTHIA6_ROOT/lib FC="$FC" -perl -p -i -e "s|FC = gfortran|FC = $(which gfortran) -fPIC|;s|CC = gcc|CC = $(which gcc) -fPIC|" config.mk -%build -make PHOTOS_ROOT=$PHOTOS_ROOT - -%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/toprex-4.23-archive-only.patch b/toprex-4.23-archive-only.patch deleted file mode 100644 index 3dc831eac93..00000000000 --- a/toprex-4.23-archive-only.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/toprex/4.23/Makefile b/toprex/4.23/Makefile -index 8305219..2667835 100644 ---- a/toprex/4.23/Makefile -+++ b/toprex/4.23/Makefile -@@ -47,10 +47,6 @@ all: libs - - - libs: -- @LIBNAME=$(LIBDIR)/libtoprex.so ; DIRNAME=src ; \ -- export LIBNAME ; export DIRNAME ; \ -- $(MAKE) -f Makeshared.subdir -- - @LIBNAME=$(LIBDIR)/archive/libtoprex.a ; DIRNAME=src ; \ - export LIBNAME ; export DIRNAME ; \ - $(MAKE) -f Makearchive.subdir diff --git a/toprex-4.23-macosx.patch b/toprex-4.23-macosx.patch deleted file mode 100644 index a0e7517afdc..00000000000 --- a/toprex-4.23-macosx.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/toprex/4.23/Makeshared.subdir b/toprex/4.23/Makeshared.subdir -index 9a832ec..acac5aa 100644 ---- a/toprex/4.23/Makeshared.subdir -+++ b/toprex/4.23/Makeshared.subdir -@@ -42,7 +42,12 @@ objects += $(patsubst $(DIRNAME)/%.c,$(TMPDIR)/%.o,$(wildcard $(DIRNAME)/*.c)) - $(LIBNAME): $(objects) - @mkdir -p $(LIBDIR) - @echo creating the shared library $@ -- $(CXX) $(LDFLAGSSHARED) $(objects) -o $@ -shared -Wl,-soname,$(notdir $@) -+ case ${ARCH} in \ -+ Linux-*) \ -+ $(CXX) $(LDFLAGSSHARED) $(objects) -o $@ -shared -Wl,-soname,$(notdir $@) ;; \ -+ Darwin-*) \ -+ $(CXX) $(LDFLAGSSHARED) $(objects) -o $@ -L$(PYTHIA6_ROOT)/lib -lpythia6 -shared -dynamic -Wl,-commons -Wl,use_dylibs $(shell gfortran --print-file-name=libgfortran.a);; \ -+ esac - - deps := $(patsubst $(DIRNAME)/%.F,$(TMPDIR)/%.d,$(wildcard $(DIRNAME)/*.F)) - -diff --git a/toprex/4.23/configure b/toprex/4.23/configure -index 1f7007c..df051f3 100755 ---- a/toprex/4.23/configure -+++ b/toprex/4.23/configure -@@ -107,23 +107,25 @@ if [ $ARCH = Linux ]; then - fi - fi - # Linux platform with gcc4: new Fortran90 compiler. --if [ $ARCH = Linux-gcc4 ]; then -- export FC=gfortran -- export FFLAGS="${FFLAGS_OPT}" -- export CFLAGS="${CFLAGS_OPT}" -- export CXXFLAGS="${CXXFLAGS_OPT}" -- export FLIBS="-lgfortran -lgfortranbegin" -- if [ ${COMPMODE} = OPT ]; then -+case $ARCH in -+ *-gcc4) -+ export FC=gfortran - export FFLAGS="${FFLAGS_OPT}" - export CFLAGS="${CFLAGS_OPT}" - export CXXFLAGS="${CXXFLAGS_OPT}" -- fi -- if [ ${COMPMODE} = DBG ]; then -- export FFLAGS="${FFLAGS_DBG}" -- export CFLAGS="${CFLAGS_DBG}" -- export CXXFLAGS="${CXXFLAGS_DBG}" -- fi --fi -+ export FLIBS="-lgfortran -lgfortranbegin" -+ if [ ${COMPMODE} = OPT ]; then -+ export FFLAGS="${FFLAGS_OPT}" -+ export CFLAGS="${CFLAGS_OPT}" -+ export CXXFLAGS="${CXXFLAGS_OPT}" -+ fi -+ if [ ${COMPMODE} = DBG ]; then -+ export FFLAGS="${FFLAGS_DBG}" -+ export CFLAGS="${CFLAGS_DBG}" -+ export CXXFLAGS="${CXXFLAGS_DBG}" -+ fi -+ ;; -+esac - - #Platform & opt/dbg - independent flags and variables: - diff --git a/toprex.spec b/toprex.spec deleted file mode 100644 index d43755ce30a..00000000000 --- a/toprex.spec +++ /dev/null @@ -1,28 +0,0 @@ -### RPM external toprex 4.23 - -Source: http://service-spi.web.cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-%{realversion}-src.tgz -Patch1: toprex-4.23-macosx -Patch2: toprex-4.23-archive-only -Requires: pythia6 - -%define keep_archives true - -%prep -%setup -q -n %{n}/%{realversion} -# Remove options by hand since it looks like they have -# the bad habit of republishing sources. -perl -p -i -e 's|-fno-globals||g;s|-finit-local-zero||g;s|-fugly-logint||g' configure - -%patch1 -p3 -%patch2 -p3 - -%build -FC="$(which gfortran) -fPIC" - -./configure --lcgplatform=%cmsplatf -make FC="$FC" PYTHIA6_ROOT=$PYTHIA6_ROOT - -%install -tar -c lib include | tar -x -C %i -find %i/lib/archive -name "*.a" -exec mv {} %i/lib \; -rm -rf %i/lib/archive