Atri Bhattacharya
877f72954c
* Update to version 8.311. * Make doc package noarch. OBS-URL: https://build.opensuse.org/request/show/1158114 OBS-URL: https://build.opensuse.org/package/show/science/pythia?expand=0&rev=61
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
a variant was sent via mail to phil...@cern.ch
|
|
|
|
Index: pythia8311/configure
|
|
===================================================================
|
|
--- pythia8311.orig/configure
|
|
+++ pythia8311/configure
|
|
@@ -304,7 +304,7 @@ done
|
|
|
|
# Parse the user arguments and evaluate each as a global variable.
|
|
echo "# PYTHIA configuration file." > $CFG_FILE
|
|
-echo "# Generated on" `date` "with the user supplied options:" >> $CFG_FILE
|
|
+echo "# Generated with the user supplied options:" >> $CFG_FILE
|
|
for VAR in "$@"; do
|
|
if [[ $OPTIONS =~ (^| )${VAR%%=*}($| ) ]]; then
|
|
echo "# $VAR" >> $CFG_FILE;
|
|
Index: pythia8311/Makefile
|
|
===================================================================
|
|
--- pythia8311.orig/Makefile
|
|
+++ pythia8311/Makefile
|
|
@@ -128,11 +128,10 @@ $(LOCAL_LIB)/libpythia8powheg%.so: $(POW
|
|
$(LOCAL_TMP)/LHAPowheg.o $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
|
|
$(CXX) $(LOCAL_TMP)/LHAPowheg.o -o $@ $(CXX_COMMON) $(CXX_SHARED)\
|
|
$(CXX_SONAME)$(notdir $@) -Llib -lpythia8\
|
|
-ifneq ($(DISABLE_RPATH),true)
|
|
- -Wl,-rpath,../lib:$(POWHEG_BIN) -L$(POWHEG_BIN) -l$*
|
|
-else
|
|
+ ifneq($(DISABLE_RPATH),true)
|
|
+ -Wl,-rpath,../lib:$(POWHEG_BIN)\
|
|
+ endif
|
|
-L$(POWHEG_BIN) -l$*
|
|
-endif
|
|
$(LOCAL_LIB)/libpythia8powhegHooks.so: $(LOCAL_TMP)/PowhegHooks.o\
|
|
$(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
|
|
$(CXX) $< -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\
|