Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pythia for openSUSE:Factory checked in at 2022-01-14 23:13:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pythia (Old) and /work/SRC/openSUSE:Factory/.pythia.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pythia" Fri Jan 14 23:13:20 2022 rev:27 rq:946355 version:8.306 Changes: -------- --- /work/SRC/openSUSE:Factory/pythia/pythia.changes 2021-04-17 00:02:30.409664256 +0200 +++ /work/SRC/openSUSE:Factory/.pythia.new.1892/pythia.changes 2022-01-14 23:14:46.646691233 +0100 @@ -1,0 +2,40 @@ +Wed Jan 5 16:00:14 UTC 2022 - Atri Bhattacharya <[email protected]> + +- Drop HepMC2 dependency and build without hepmc2 support; largely + superseded by HepMC(3) and this change allows Leap 15.x builds + to proceed without HepMC2-HepMC conflicts. +- Add BuildRequires: fastjet-plugin-siscone-devel which is needed + for one of the tests (test number 111). + +------------------------------------------------------------------- +Sun Dec 12 21:15:04 UTC 2021 - Atri Bhattacharya <[email protected]> + +- Update to version 8.306: + * Fixed the incorrect scale being set when applying the POWHEG + veto, i.e. main31.cc. Note that the number of emissions is + correct in 8.303, but is incorrect in 8.304 and 8.305. + * Fixed repeated initialization causing an ever expanding + physics pointer list in the main Pythia class. + * Fixed issue for HepMC output from Vincia, which would + previously issue warnings about inconsistent mother/daughter + relationships. + * Removed assert statements from Angantyr. + * Shortened Pythia constructor header. +- Rebase pythia-honour-env-cxxflags.patch and + pythia-makefile-destdir-support.patch to apply cleanly. +- Major rebase of pythia-remove-rpaths.patch for updated version. +- Drop patch not required any more: + * pythia-disable-example23-req-MixMax_h.patch: Examples can now + be disabled by passing options to the run script. +- Change BuildRequires to pkgconfig based ones wherever + appropriate. +- More examples need linking against gmp explicitly: add fixes for + all necessary examples to patch pythia-example71-link-gmp.patch + and rename it to pythia-examples-link-gmp.patch. +- Build with Rivet and HepMC(3) support: add HepMC-devel, + pkgconfig(rivet) BuildRequires. +- Update URL and source URL in keeping with upstream. +- Minor improvements to package summaries. +- Run spec-cleaner for minor cleanups. + +------------------------------------------------------------------- Old: ---- pythia-disable-example23-req-MixMax_h.patch pythia-example71-link-gmp.patch pythia8245.tgz New: ---- pythia-examples-link-gmp.patch pythia8306.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pythia.spec ++++++ --- /var/tmp/diff_new_pack.zBW010/_old 2022-01-14 23:14:47.370691700 +0100 +++ /var/tmp/diff_new_pack.zBW010/_new 2022-01-14 23:14:47.370691700 +0100 @@ -1,7 +1,7 @@ # # spec file for package pythia # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,36 +16,40 @@ # -%define ver 8245 +%define ver 8306 %define soname lib%{name}8 Name: pythia -Version: 8.245 +Version: 8.306 Release: 0 Summary: A simulation program for particle collisions at very high energies License: GPL-2.0-or-later Group: Development/Libraries/C and C++ -URL: http://home.thep.lu.se/~torbjorn/Pythia.html -Source: http://home.thep.lu.se/~torbjorn/pythia8/%{name}%{ver}.tgz +URL: https://pythia.org/ +Source: https://pythia.org/download/pythia83/%{name}%{ver}.tgz # PATCH-FIX-UPSTREAM pythia-makefile-destdir-support.patch [email protected] -- Add DESTDIR support to makefile to prevent touching of buildroot in the %%build section Patch0: pythia-makefile-destdir-support.patch # PATCH-FIX-UPSTREAM pythia-honour-env-cxxflags.patch [email protected] -- Append CXXFLAGS from env to default compilations flags; this allows us to pass RPM_OPT_FLAGS during compilation Patch1: pythia-honour-env-cxxflags.patch # PATCH-FIX-UPSTREAM pythia-remove-rpaths.patch [email protected] -- Delete rpath references when building libraries; patch sent upstream Patch2: pythia-remove-rpaths.patch -# PATCH-FIX-UPSTREAM pythia-example71-link-gmp.patch [email protected] -- Fix building example 71 by adding -lgmp to the linker flag -Patch3: pythia-example71-link-gmp.patch -# PATCH-FEATURE-OPENSUSE pythia-disable-example23-req-MixMax_h.patch [email protected] -- Drop a test that requires non-free MixMax.h header -Patch4: pythia-disable-example23-req-MixMax_h.patch +# PATCH-FIX-UPSTREAM pythia-examples-link-gmp.patch [email protected] -- Fix building examples linking against gmp by adding -lgmp to the linker flag +Patch3: pythia-examples-link-gmp.patch # PATCH-FIX-OPENSUSE - a variant was sent via mail to [email protected] Patch5: reproducible.patch -BuildRequires: HepMC2-devel -BuildRequires: LHAPDF-devel +BuildRequires: HepMC-devel +BuildRequires: cgal-devel +BuildRequires: fastjet-contrib-devel-static BuildRequires: fastjet-devel +BuildRequires: fastjet-plugin-siscone-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gmp-devel +BuildRequires: hdf5-devel +BuildRequires: pkgconfig BuildRequires: rsync -BuildRequires: zlib-devel +BuildRequires: pkgconfig(lhapdf) +BuildRequires: pkgconfig(rivet) +BuildRequires: pkgconfig(zlib) %description Pythia can be used to generate high-energy-physics events, i.e. sets @@ -53,7 +57,7 @@ incoming particles. %package -n %{soname} -Summary: A simulation program for particle collisions at very high energies +Summary: Shared library for Pythia - a simulation program for particle collisions Group: System/Libraries %description -n %{soname} @@ -74,7 +78,7 @@ This package provides the shared libraries for %{name}. %package -n %{soname}lhapdf6 -Summary: A simulation program for particle collisions at very high energies +Summary: LHAPDF bindings for Pythia - a simulation program for particle collisions Group: System/Libraries %description -n %{soname}lhapdf6 @@ -86,7 +90,7 @@ %{name}. %package devel -Summary: A simulation program for particle collisions at very high energies +Summary: Development package for Pythia - a simulation program for particle collisions Group: Development/Libraries/C and C++ Requires: %{soname} = %{version} Requires: %{soname}lhapdf6 = %{version} @@ -101,7 +105,7 @@ %{name}. %package doc -Summary: A simulation program for particle collisions at very high energies +Summary: Documentation for Pythia - a simulation program for particle collisions Group: Documentation/HTML %description doc @@ -117,16 +121,17 @@ # REMOVE NON-FREE HEADER FILE NOT USED BY PYTHIA DIRECTLY rm include/Pythia8Plugins/MixMax.h -%build # FIX EOF ENCODINGS -sed -i 's/\r$//' share/Pythia8/xmldoc/mrstlostarstar.00.dat +sed -i 's/\r$//' share/Pythia8/pdfdata/mrstlostarstar.00.dat sed -i 's/\r$//' share/Pythia8/htmldoc/pythia.css -sed -i 's/\r$//' share/Pythia8/phpdoc/pythia.css sed -i 's/\r$//' examples/main29.cc +sed -E -i "s|%{_bindir}/env bash|/bin/bash|" examples/runmains + +%build # FOR oS > 1320, "-std=c++14" IS NEEDED FOR BUILDING EXAMPLES # WITH FASTJET3 (WHICH ALREADY USES THIS STD) -CXXFLAGS="%optflags" +CXXFLAGS="%{optflags}" %if 0%{?suse_version} > 1320 export CXXFLAGS="$CXXFLAGS -std=c++14" %endif @@ -135,11 +140,12 @@ --prefix-lib=%{_libdir} \ --prefix-share=%{_docdir}/%{name} \ --enable-shared \ - --disable-rpath \ - --with-lhapdf6 \ - --with-hepmc2 \ + --with-fastjet3 \ --with-gzip \ - --with-fastjet3 + --with-hdf5 \ + --with-hepmc3 \ + --with-lhapdf6 \ + --with-rivet # EXPORT PYTHIA8DATA ENV VARIABLE cat << EOF >> %{name}.sh @@ -150,7 +156,7 @@ setenv PYTHIA8DATA %{_docdir}/%{name}/xmldoc EOF -make %{?_smp_mflags} +%make_build %install %make_install @@ -168,31 +174,20 @@ done # FIX env BASED HASHBANG -sed -E -i "s|/usr/bin/env bash|/bin/bash|" %{buildroot}%{_bindir}/pythia8-config +sed -E -i "s|%{_bindir}/env bash|/bin/bash|" %{buildroot}%{_bindir}/pythia8-config %fdupes -s %{buildroot}%{_docdir}/%{name}/ %check +# Determine the number of CPUs available for runs +export ncpus=%(echo %{?_smp_mflags} | sed "s/^\-j//") pushd examples -./runmains -# ADDITIONAL CHECKS FOR BINDINGS; RUN MANUALLY BECAUSE NOT ALL BINDINGS ARE ENABLED -# HEPMC2 AND FASTJET3 TESTS -for t in 41 71 72 -do - echo - echo Now begin main${t} - make %{?_smp_mflags} main${t} - time ./main${t} > out${t} -done -# TESTS 42 REQUIRES INPUT FILES; LOOP TO MAKE IT EASY TO ADD FUTURE TESTS -for t in 42 -do - echo - echo Now begin main${t} - make %{?_smp_mflags} main${t} - time ./main${t} main${t}.cmnd hepmcout${t}.dat > out${t} -done - +# SECTION Disabled examples: +# 23: MixMax header deleted as it is non-free +# 46, 48: Require evtgen which oS does not have packaged +# 91, 92, 93: Require root6 which is not avaliable in Factory +./runmains --skip="23 46 48 91 92 93" --threads="${ncpus}" +# /SECTION popd %post -n %{soname} -p /sbin/ldconfig @@ -214,13 +209,12 @@ %{_includedir}/Pythia8Plugins/ %config %{_sysconfdir}/profile.d/%{name}.* %{_docdir}/%{name}/xmldoc/ +%{_docdir}/%{name}/pdfdata/ %files doc %dir %{_docdir}/%{name} -%{_docdir}/%{name}/phpdoc/ %{_docdir}/%{name}/pdfdoc/ %{_docdir}/%{name}/htmldoc/ %{_docdir}/%{name}/examples/ -%{_docdir}/%{name}/outref/ %changelog ++++++ pythia-examples-link-gmp.patch ++++++ Index: pythia8306/examples/Makefile =================================================================== --- pythia8306.orig/examples/Makefile +++ pythia8306/examples/Makefile @@ -100,7 +100,7 @@ endif # FASTJET3. main71 main72 main75 main81 main82 main83: $(PYTHIA) [email protected] ifeq ($(FASTJET3_USE),true) - $(CXX) [email protected] -o $@ -w $(CXX_COMMON) $(FASTJET3_INCLUDE) $(FASTJET3_LIB) + $(CXX) [email protected] -o $@ -w $(CXX_COMMON) $(FASTJET3_INCLUDE) $(FASTJET3_LIB) -lgmp else $(error Error: $@ requires FASTJET3) endif @@ -109,7 +109,7 @@ endif main74: $(PYTHIA) [email protected] ifeq ($(FASTJET3_USE),true) $(CXX) [email protected] -o $@ -w $(CXX_COMMON) $(FASTJET3_INCLUDE)\ - $(FASTJET3_LIB) -lfastjettools -lRecursiveTools + $(FASTJET3_LIB) -lfastjettools -lRecursiveTools -lgmp else $(error Error: $@ requires FASTJET3) endif @@ -118,7 +118,7 @@ endif main84: $(PYTHIA) [email protected] ifeq ($(FASTJET3_USE)$(HEPMC3_USE),truetrue) $(CXX) [email protected] -o $@ -w $(CXX_COMMON) $(FASTJET3_INCLUDE)\ - $(HEPMC3_INCLUDE) $(FASTJET3_LIB) $(HEPMC3_LIB) + $(HEPMC3_INCLUDE) $(FASTJET3_LIB) $(HEPMC3_LIB) -lgmp else $(error Error: $@ requires FASTJET3 and HEPMC3) endif ++++++ pythia-honour-env-cxxflags.patch ++++++ --- /var/tmp/diff_new_pack.zBW010/_old 2022-01-14 23:14:47.410691726 +0100 +++ /var/tmp/diff_new_pack.zBW010/_new 2022-01-14 23:14:47.410691726 +0100 @@ -1,14 +1,14 @@ -Index: pythia8240/configure +Index: pythia8306/configure =================================================================== ---- pythia8240.orig/configure -+++ pythia8240/configure -@@ -297,7 +297,7 @@ if [ -z "$CXX" ]; then - CXX="g++"; - fi +--- pythia8306.orig/configure ++++ pythia8306/configure +@@ -309,7 +309,7 @@ if [ "$ARCH" != "LINUX" ] && [ "$ARCH" ! + warn "Unknown architecture $ARCH, set as LINUX."; ARCH="LINUX"; fi + if [ -z "$CXX" ]; then warn "CXX not set, using g++."; CXX="g++"; fi if [ -z "$CXX_COMMON" ]; then - CXX_COMMON="${ENABLE_DEBUG}${ENABLE_64BIT}" + CXX_COMMON="${CXXFLAGS} ${ENABLE_DEBUG}${ENABLE_64BIT}" - CXX_COMMON="$CXX_COMMON -pedantic -W -Wall -Wshadow -fPIC"; fi + CXX_COMMON="${CXX_COMMON}-std=c++11 -pedantic -W -Wall -Wshadow -fPIC"; fi if [ -z "$CXX_SHARED" ]; then if [ "$ARCH" = "LINUX" ]; then CXX_SHARED="-shared"; fi ++++++ pythia-makefile-destdir-support.patch ++++++ --- /var/tmp/diff_new_pack.zBW010/_old 2022-01-14 23:14:47.422691734 +0100 +++ /var/tmp/diff_new_pack.zBW010/_new 2022-01-14 23:14:47.426691736 +0100 @@ -1,25 +1,23 @@ -Index: pythia8240/Makefile +Index: pythia8306/Makefile =================================================================== ---- pythia8240.orig/Makefile -+++ pythia8240/Makefile -@@ -149,13 +149,13 @@ $(LOCAL_LIB)/_pythia8.so: $(LOCAL_INCLUD +--- pythia8306.orig/Makefile ++++ pythia8306/Makefile +@@ -132,12 +132,12 @@ python: $(LOCAL_LIB)/libpythia8$(LIB_SUF - # Install (rsync is used for finer control). + # Install. install: all - mkdir -p $(PREFIX_BIN) $(PREFIX_INCLUDE) $(PREFIX_LIB) $(PREFIX_SHARE) -- rm -f $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) -- rsync -a $(LOCAL_BIN)/* $(PREFIX_BIN) --exclude .svn -- rsync -a $(LOCAL_INCLUDE)/* $(PREFIX_INCLUDE) --exclude .svn -- rsync -a $(LOCAL_LIB)/* $(PREFIX_LIB) --exclude .svn -- rsync -a $(LOCAL_SHARE)/* $(PREFIX_SHARE) --exclude .svn -- rsync -a $(LOCAL_EXAMPLE) $(PREFIX_SHARE) --exclude .svn -+ mkdir -p $(DESTDIR)/$(PREFIX_BIN) $(DESTDIR)/$(PREFIX_INCLUDE) $(DESTDIR)/$(PREFIX_LIB) $(DESTDIR)/$(PREFIX_SHARE) -+ rm -f $(DESTDIR)/$(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) -+ rsync -a $(LOCAL_BIN)/* $(DESTDIR)/$(PREFIX_BIN) --exclude .svn -+ rsync -a $(LOCAL_INCLUDE)/* $(DESTDIR)/$(PREFIX_INCLUDE) --exclude .svn -+ rsync -a $(LOCAL_LIB)/* $(DESTDIR)/$(PREFIX_LIB) --exclude .svn -+ rsync -a $(LOCAL_SHARE)/* $(DESTDIR)/$(PREFIX_SHARE) --exclude .svn -+ rsync -a $(LOCAL_EXAMPLE) $(DESTDIR)/$(PREFIX_SHARE) --exclude .svn +- rsync -a $(LOCAL_BIN)/* $(PREFIX_BIN) +- rsync -a $(LOCAL_INCLUDE)/* $(PREFIX_INCLUDE) +- rsync -a $(LOCAL_LIB)/* $(PREFIX_LIB) +- rsync -a $(LOCAL_SHARE)/* $(PREFIX_SHARE) +- rsync -a $(LOCAL_EXAMPLE) $(PREFIX_SHARE) ++ mkdir -p $(DESTDIR)$(PREFIX_BIN) $(DESTDIR)$(PREFIX_INCLUDE) $(DESTDIR)$(PREFIX_LIB) $(DESTDIR)$(PREFIX_SHARE) ++ rsync -a $(LOCAL_BIN)/* $(DESTDIR)$(PREFIX_BIN) ++ rsync -a $(LOCAL_INCLUDE)/* $(DESTDIR)$(PREFIX_INCLUDE) ++ rsync -a $(LOCAL_LIB)/* $(DESTDIR)$(PREFIX_LIB) ++ rsync -a $(LOCAL_SHARE)/* $(DESTDIR)$(PREFIX_SHARE) ++ rsync -a $(LOCAL_EXAMPLE) $(DESTDIR)$(PREFIX_SHARE) # Clean. clean: ++++++ pythia-remove-rpaths.patch ++++++ --- /var/tmp/diff_new_pack.zBW010/_old 2022-01-14 23:14:47.434691742 +0100 +++ /var/tmp/diff_new_pack.zBW010/_new 2022-01-14 23:14:47.438691744 +0100 @@ -1,134 +1,170 @@ -Index: pythia8240/Makefile +Index: pythia8306/Makefile =================================================================== ---- pythia8240.orig/Makefile -+++ pythia8240/Makefile -@@ -64,19 +64,30 @@ ifeq ($(POWHEG_USE),true) - endif - - # Python. --PYTHON_COMMON=-I$(PYTHON_INCLUDE) $(CXX_COMMON) -Wl,-rpath,$(PREFIX_LIB) -+PYTHON_COMMON=-I$(PYTHON_INCLUDE) $(CXX_COMMON) -+ifneq ($(DISABLE_RPATH),true) -+ PYTHON_COMMON+= -Wl,-rpath,$(PREFIX_LIB) -+endif - ifeq ($(PYTHON_USE),true) - TARGETS+=$(LOCAL_LIB)/_pythia8.so - endif - - # GZIP. - OBJ_COMMON=-MD $(CXX_COMMON) --LIB_COMMON=-Wl,-rpath,$(PREFIX_LIB) -ldl -+ifneq ($(DISABLE_RPATH),true) -+ LIB_COMMON=-Wl,-rpath,$(PREFIX_LIB) -ldl -+else -+ LIB_COMMON=-ldl -+endif - ifeq ($(GZIP_USE),true) - PYTHON_COMMON+= -DGZIPSUPPORT -I$(GZIP_INCLUDE) -- PYTHON_COMMON+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz - OBJ_COMMON+= -DGZIPSUPPORT -I$(GZIP_INCLUDE) -- LIB_COMMON+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz -+ ifneq ($(DISABLE_RPATH),true) -+ LIB_COMMON+= -Wl,-rpath,$(GZIP_LIB) -+ PYTHON_COMMON+= -Wl,-rpath,$(GZIP_LIB) -+ endif -+ PYTHON_COMMON+= -L$(GZIP_LIB) -lz -+ LIB_COMMON+= -L$(GZIP_LIB) -lz - endif - - ################################################################################ -@@ -118,12 +129,22 @@ $(LOCAL_TMP)/LHAPDF%Plugin.o: $(LOCAL_IN - $(CXX) -x c++ $< -o $@ -c -MD -w $(CXX_LHAPDF) - $(LOCAL_LIB)/libpythia8lhapdf5.so: $(LOCAL_TMP)/LHAPDF5Plugin.o\ - $(LOCAL_LIB)/libpythia8.a +--- pythia8306.orig/Makefile ++++ pythia8306/Makefile +@@ -36,7 +36,11 @@ LOCAL_TMP=tmp + LOCAL_MKDIRS:=$(shell mkdir -p $(LOCAL_TMP) $(LOCAL_LIB)) + CXX_COMMON:=-I$(LOCAL_INCLUDE) $(CXX_COMMON) + OBJ_COMMON:=-MD $(CXX_COMMON) $(OBJ_COMMON) +-LIB_COMMON=-Wl,-rpath,../lib:$(PREFIX_LIB) -ldl $(GZIP_LIB) +ifneq ($(DISABLE_RPATH),true) - $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ - -L$(LHAPDF5_LIB) -Wl,-rpath,$(LHAPDF5_LIB) -lLHAPDF -lgfortran ++ LIB_COMMON=-Wl,-rpath,$(PREFIX_LIB) -ldl $(GZIP_LIB) +else -+ $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ -+ -L$(LHAPDF5_LIB) -lLHAPDF -lgfortran -+endif - $(LOCAL_LIB)/libpythia8lhapdf6.so: $(LOCAL_TMP)/LHAPDF6Plugin.o\ - $(LOCAL_LIB)/libpythia8.a -+ifneq ($(DISABLE_RPATH),true) -+ $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ -+ -L$(LHAPDF6_LIB) -Wl,-rpath,$(LHAPDF6_LIB) -lLHAPDF -+else - $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ -- -L$(LHAPDF6_LIB) -Wl,-rpath,$(LHAPDF6_LIB) -lLHAPDF -+ -L$(LHAPDF6_LIB) -lLHAPDF ++ LIB_COMMON=-ldl $(GZIP_LIB) +endif - # POWHEG (exclude any executable ending with sh). - $(LOCAL_TMP)/POWHEGPlugin.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPowheg.h -@@ -131,9 +152,15 @@ $(LOCAL_TMP)/POWHEGPlugin.o: $(LOCAL_INC - $(LOCAL_LIB)/libpythia8powheg%sh.so: $(POWHEG_BIN)/%sh; - $(LOCAL_LIB)/libpythia8powheg%.so: $(POWHEG_BIN)/% $(LOCAL_TMP)/POWHEGPlugin.o\ - $(LOCAL_LIB)/libpythia8.a + # PYTHIA. + OBJECTS=$(patsubst $(LOCAL_SRC)/%.cc,$(LOCAL_TMP)/%.o,\ +@@ -118,9 +122,15 @@ $(LOCAL_TMP)/LHAPowheg.o: $(LOCAL_INCLUD + $(LOCAL_LIB)/libpythia8powheg%sh.so: $(POWHEG_BIN)%sh; + $(LOCAL_LIB)/libpythia8powheg%.so: $(POWHEG_BIN)% $(LOCAL_TMP)/LHAPowheg.o\ + $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX) +ifneq ($(DISABLE_RPATH),true) -+ ln -s $< $(notdir $<); $(CXX) $(notdir $<) $(LOCAL_TMP)/POWHEGPlugin.o\ -+ $(LOCAL_LIB)/libpythia8.a -o $@ $(CXX_COMMON) $(CXX_SHARED)\ -+ $(CXX_SONAME)$(notdir $@) -Wl,-rpath,$(POWHEG_BIN); rm $(notdir $<) + ln -s $< $(notdir $<); $(CXX) $(notdir $<) $(LOCAL_TMP)/LHAPowheg.o\ + -o $@ $(CXX_COMMON) $(CXX_SHARED) -Llib -lpythia8\ + $(CXX_SONAME)$(notdir $@) -Wl,-rpath,$(POWHEG_BIN); rm $(notdir $<) +else - ln -s $< $(notdir $<); $(CXX) $(notdir $<) $(LOCAL_TMP)/POWHEGPlugin.o\ - $(LOCAL_LIB)/libpythia8.a -o $@ $(CXX_COMMON) $(CXX_SHARED)\ -- $(CXX_SONAME)$(notdir $@) -Wl,-rpath,$(POWHEG_BIN); rm $(notdir $<) ++ ln -s $< $(notdir $<); $(CXX) $(notdir $<) $(LOCAL_TMP)/LHAPowheg.o\ ++ -o $@ $(CXX_COMMON) $(CXX_SHARED) -Llib -lpythia8\ + $(CXX_SONAME)$(notdir $@); rm $(notdir $<) +endif - # Python (turn off all warnings for readability). - $(LOCAL_LIB)/pythia8.py: $(LOCAL_INCLUDE)/Pythia8Plugins/PythonWrapper.h -Index: pythia8240/configure + # MG5 matrix element plugins. + mg5mes: +Index: pythia8306/configure =================================================================== ---- pythia8240.orig/configure -+++ pythia8240/configure -@@ -32,6 +32,7 @@ Configuration options. +--- pythia8306.orig/configure ++++ pythia8306/configure +@@ -30,6 +30,7 @@ Configuration options. + --help : Print this help message (also -h, --h, and -help). + --enable-debug : Turn on debugging and disable optimization. --enable-optdebug : Turn on debugging but allow optimization. - --enable-64bit : Turn on 64-bit compilation. - --enable-shared : Build the shared PYTHIA library during compilation. -+--disable-rpath : Disable use of rpath for linking. - --lcg=PLATFORM : Specify the LCG platform to use when the - --with-PACKAGE-version option, described below, is set for a - given optional package [x86_64-slc6-gcc48-opt]. The packages -@@ -87,7 +88,7 @@ Advanced options. - for OS X. ++--disable-rpath : Disable use of rpath for linking. + --lcg=PLATFORM : Specify the LCG platform to use when the + --with-PACKAGE-version option, described below, is set for + a given optional package [x86_64-slc6-gcc48-opt]. The +@@ -92,7 +93,7 @@ Advanced options. + --obj-common='FLAGS' : Set the common C++ flags used for object (.o) compilation + only (not linking). BLOCKTEXT - OPTIONS="-h --h -help --help --enable-debug --enable-optdebug --enable-64bit" --OPTIONS+=" --enable-shared --lcg" -+OPTIONS+=" --enable-shared --disable-rpath --lcg" +-OPTIONS="-h --h -help --help --enable-debug --enable-optdebug --lcg" ++OPTIONS="-h --h -help --help --enable-debug --enable-optdebug --disable-rpath --lcg" OPTIONS+=" --prefix --prefix-bin --prefix-lib --prefix-include --prefix-share" for PKG in "evtgen" "fastjet3" "hepmc2" "hepmc3" "lhapdf5" "lhapdf6" "powheg"\ - "promc" "root" "gzip" "boost" "python"; do -@@ -285,6 +286,7 @@ if [ "$LCG_SET" != true ]; then LCG=x86_ - [ "$ENABLE_OPTDEBUG_SET" = true ] && ENABLE_DEBUG="-g -O " - [ "$ENABLE_64BIT_SET" = true ] && ENABLE_64BIT="-m64 " || ENABLE_64BIT="" - [ "$ENABLE_SHARED_SET" = true ] && ENABLE_SHARED="true" || ENABLE_SHARED="false" -+[ "$DISABLE_RPATH_SET" = true ] && DISABLE_RPATH="true" || DISABLE_RPATH="false" - if [ -z "$ARCH" ]; then - ARCH=$(uname | grep -i -o -e Linux -e Darwin); - fi -@@ -416,6 +418,7 @@ PREFIX_SHARE=$PREFIX_SHARE + "rivet" "root" "yoda" "gzip" "python" "mg5mes" "openmp" "mpich" "hdf5"\ +@@ -303,6 +304,7 @@ done + if [ "$LCG_SET" != true ]; then LCG=x86_64-slc6-gcc48-opt; fi + [ "$ENABLE_DEBUG_SET" = true ] && ENABLE_DEBUG="-g " || ENABLE_DEBUG="-O2 " + [ "$ENABLE_OPTDEBUG_SET" = true ] && ENABLE_DEBUG="-g -O " ++[ "$DISABLE_RPATH_SET" = true ] && DISABLE_RPATH="true" || DISABLE_RPATH="false" + if [ -z "$ARCH" ]; then ARCH=$(uname | grep -i -o -e Linux -e Darwin); fi + ARCH=$(echo $ARCH | awk '{print toupper($0)}') + if [ "$ARCH" != "LINUX" ] && [ "$ARCH" != "DARWIN" ]; then +@@ -427,6 +429,7 @@ PREFIX_LIB=$PREFIX_LIB + PREFIX_SHARE=$PREFIX_SHARE # Compilation flags (see ./configure --help for further documentation). - ENABLE_SHARED=$ENABLE_SHARED +DISABLE_RPATH=$DISABLE_RPATH CXX=$CXX CXX_COMMON=$CXX_COMMON CXX_SHARED=$CXX_SHARED -Index: pythia8240/examples/Makefile +Index: pythia8306/plugins/mg5mes/Makefile =================================================================== ---- pythia8240.orig/examples/Makefile -+++ pythia8240/examples/Makefile -@@ -25,7 +25,10 @@ GZIP_INC= - GZIP_FLAGS= - ifeq ($(GZIP_USE),true) - GZIP_INC+= -DGZIPSUPPORT -I$(GZIP_INCLUDE) -- GZIP_FLAGS+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz -+ GZIP_FLAGS+= -L$(GZIP_LIB) -lz -+ ifneq ($(DISABLE_RPATH),true) -+ GZIP_FLAGS+= -Wl,-rpath,$(GZIP_LIB) -+ endif +--- pythia8306.orig/plugins/mg5mes/Makefile ++++ pythia8306/plugins/mg5mes/Makefile +@@ -28,7 +28,11 @@ LOCAL_DIRS:=$(subst $(LOCAL_TMP)/,,$(wil + LOCAL_MKDIRS:=$(shell mkdir -p $(LOCAL_TMP) $(TOP_LIB)) + LOCAL_MKDIRS:=$(foreach DIR,$(LOCAL_DIRS),$(shell mkdir -p $(LOCAL_TMP)/$(DIR))) + OBJ_COMMON=-MD -DPYTHIA8 $(CXX_COMMON) -I$(TOP_INCLUDE) -w -fpermissive +-LIB_COMMON=-Wl,-rpath,$(TOP_LIB) -ldl $(GZIP_LIB) -Wl,-undefined,dynamic_lookup ++ifneq ($(DISABLE_RPATH),true) ++ LIB_COMMON=-Wl,-rpath,$(TOP_LIB) -ldl $(GZIP_LIB) -Wl,-undefined,dynamic_lookup ++else ++ LIB_COMMON=-ldl $(GZIP_LIB) -Wl,-undefined,dynamic_lookup ++endif + PYTHIA=$(TOP_LIB)/libpythia8$(LIB_SUFFIX) + + # Set the wrapper, determine the objects and targets. +Index: pythia8306/plugins/python/Makefile +=================================================================== +--- pythia8306.orig/plugins/python/Makefile ++++ pythia8306/plugins/python/Makefile +@@ -27,7 +27,11 @@ LOCAL_TMP=tmp + LOCAL_INCLUDE=include + LOCAL_MKDIRS:=$(shell mkdir -p $(LOCAL_TMP) $(TOP_LIB)) + OBJ_COMMON=-MD $(CXX_COMMON) -Iinclude $(PYTHON_INCLUDE) -w -fpermissive +-LIB_COMMON=-Wl,-rpath,$(TOP_LIB) -ldl $(GZIP_LIB) ++ifneq ($(DISABLE_RPATH),true) ++ LIB_COMMON=-Wl,-rpath,$(TOP_LIB) -ldl $(GZIP_LIB) ++else ++ LIB_COMMON=-ldl $(GZIP_LIB) ++endif + PYTHIA=$(TOP_LIB)/libpythia8$(LIB_SUFFIX) + + # Determine the headers. +@@ -69,9 +73,15 @@ $(LOCAL_TMP)/%.o: $(LOCAL_SRC)/%.cpp + + # Build the library. + $(TOP_LIB)/pythia8.so: $(PYTHIA) $(HEADERS) $(OBJECTS) ++ifneq ($(DISABLE_RPATH),true) + $(CXX) $(OBJECTS) -o $@ $(CXX_COMMON) $(CXX_SHARED)\ + $(CXX_SONAME)$(notdir $@) $(LIB_COMMON) -L$(TOP_LIB)\ + -Wl,-rpath,$(PREFIX_LIB) -lpythia8 -Wl,-undefined,dynamic_lookup ++else ++ $(CXX) $(OBJECTS) -o $@ $(CXX_COMMON) $(CXX_SHARED)\ ++ $(CXX_SONAME)$(notdir $@) $(LIB_COMMON) -L$(TOP_LIB)\ ++ -lpythia8 -Wl,-undefined,dynamic_lookup ++endif + + # Clean. + clean: +Index: pythia8306/examples/Makefile +=================================================================== +--- pythia8306.orig/examples/Makefile ++++ pythia8306/examples/Makefile +@@ -26,14 +26,13 @@ ifneq ("$(wildcard ../lib/libpythia8.*)" + PREFIX_INCLUDE=../include + endif + CXX_COMMON:=-I$(PREFIX_INCLUDE) $(CXX_COMMON) $(GZIP_LIB) +-CXX_COMMON+= -L$(PREFIX_LIB) -Wl,-rpath,$(PREFIX_LIB) -lpythia8 -ldl ++CXX_COMMON+= -L$(PREFIX_LIB) -lpythia8 -ldl + PYTHIA=$(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + + # Fix missing runtime paths from RIVET. + ifeq ($(RIVET_USE),true) + COMMA=, + RIVET_LPATH=$(filter -L%,$(shell $(RIVET_BIN)$(RIVET_CONFIG) --ldflags)) +- RIVET_RPATH=$(subst -L,-Wl$(COMMA)-rpath=,$(RIVET_LPATH)) endif - # Check distribution (use local version first, then installed version). + ################################################################################ +@@ -143,16 +142,14 @@ else + $(error Error: $@ requires ROOT) + endif + main92: $(PYTHIA) [email protected] main92.so +- $(CXX) [email protected] main92.so -o $@ -w $(CXX_COMMON) -Wl,-rpath,./\ +- `$(ROOT_CONFIG) --cflags --glibs` ++ $(CXX) [email protected] main92.so -o $@ -w $(CXX_COMMON) + + # RIVET with optional ROOT (if RIVET, use C++14). + main93: $(PYTHIA) [email protected] $(if $(filter true,$(ROOT_USE)),main93.so) + ifeq ($(RIVET_USE),true) +- $(CXX) [email protected] -o $@ -w $(CXX_COMMON:c++11=c++14) -Wl,-rpath,./\ +- $(if $(filter true,$(ROOT_USE)),main93.so -DPY8ROOT\ ++ $(CXX) [email protected] -o $@ -w $(CXX_COMMON:c++11=c++14) -DPY8ROOT\ + $(ROOT_LIB) `$(ROOT_CONFIG) --cflags --glibs`)\ +- `$(RIVET_BIN)$(RIVET_CONFIG) --cppflags --libs` $(RIVET_RPATH) ++ `$(RIVET_BIN)$(RIVET_CONFIG) --cppflags --libs` + else + $(error Error: $@ requires RIVET) + endif +@@ -161,7 +158,7 @@ endif + main111: $(PYTHIA) [email protected] + ifeq ($(RIVET_USE),true) + $(CXX) [email protected] -o $@ -w $(CXX_COMMON:c++11=c++14) -DRIVET \ +- `$(RIVET_BIN)$(RIVET_CONFIG) --cppflags --libs` $(RIVET_RPATH) ++ `$(RIVET_BIN)$(RIVET_CONFIG) --cppflags --libs` + else + $(CXX) [email protected] -o $@ -w $(CXX_COMMON) + endif ++++++ pythia8245.tgz -> pythia8306.tgz ++++++ /work/SRC/openSUSE:Factory/pythia/pythia8245.tgz /work/SRC/openSUSE:Factory/.pythia.new.1892/pythia8306.tgz differ: char 5, line 1
