From 7130e0c08774397d456f1cdfbb0fb9a35e499426 Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Wed, 20 Apr 2022 14:43:16 +0200 Subject: [PATCH 1/2] Drop cascade MC generator --- cascade-2.2.0-nomanual.patch | 11 ------- cascade-2.2.04-drop-dcasrn.patch | 38 ------------------------ cascade-2.2.04-getenv.patch | 14 --------- cascade.spec | 51 -------------------------------- 4 files changed, 114 deletions(-) delete mode 100644 cascade-2.2.0-nomanual.patch delete mode 100644 cascade-2.2.04-drop-dcasrn.patch delete mode 100644 cascade-2.2.04-getenv.patch delete mode 100644 cascade.spec 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 From 8f215e0f84e5f823adccbefedc5de15a3bf9882f Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Wed, 20 Apr 2022 14:51:43 +0200 Subject: [PATCH 2/2] Drop charybdis MC generator --- charybdis-1.003-archive-only.patch | 15 ------- charybdis-1003-macosx.patch | 66 ------------------------------ charybdis.spec | 31 -------------- 3 files changed, 112 deletions(-) delete mode 100644 charybdis-1.003-archive-only.patch delete mode 100644 charybdis-1003-macosx.patch delete mode 100644 charybdis.spec 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 -