diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec index 3e64add7641..a2950de48ef 100644 --- a/cmssw-tool-conf.spec +++ b/cmssw-tool-conf.spec @@ -59,7 +59,6 @@ Requires: libxml2 Requires: lwtnn Requires: meschach Requires: pcre2 -Requires: photos Requires: photospp Requires: pyquen Requires: pythia6 @@ -76,7 +75,6 @@ Requires: ucx Requires: openmpi Requires: sigcpp Requires: sqlite -Requires: tauola Requires: tauolapp Requires: thepeg Requires: toprex 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/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/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 -