forked from pool/pythia
Dmitry Roshchin
bc4c8b1d9b
* Minor rebase of all patches for update. * Major rebase of pythia-examples-link-gmp.patch to apply against updated make file. * Revise disabled tests for %check. OBS-URL: https://build.opensuse.org/package/show/science/pythia?expand=0&rev=63
49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
a variant was sent via mail to phil...@cern.ch
|
|
|
|
---
|
|
Makefile | 7 +++----
|
|
configure | 4 ++--
|
|
2 files changed, 5 insertions(+), 6 deletions(-)
|
|
|
|
Index: pythia8313/configure
|
|
===================================================================
|
|
--- pythia8313.orig/configure
|
|
+++ pythia8313/configure
|
|
@@ -294,7 +294,7 @@ function error() {
|
|
################################################################################
|
|
|
|
# Check if help requested.
|
|
-bold "Running PYTHIA configuration script. Now is `date`"
|
|
+bold "Running PYTHIA configuration script"
|
|
for VAR in "$@"; do
|
|
if [ "$VAR" = "-h" ] || [ "$VAR" = "--h" ] || [ "$VAR" = "-help" ] \
|
|
|| [ "$VAR" = "--help" ]; then
|
|
@@ -305,7 +305,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: pythia8313/Makefile
|
|
===================================================================
|
|
--- pythia8313.orig/Makefile
|
|
+++ pythia8313/Makefile
|
|
@@ -129,11 +129,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_DIR) -L$(POWHEG_DIR) -l$*
|
|
-else
|
|
+ ifneq ($(DISABLE_RPATH),true)
|
|
+ -Wl,-rpath,../lib:$(POWHEG_DIR)\
|
|
+ endif
|
|
-L$(POWHEG_DIR) -l$*
|
|
-endif
|
|
$(LOCAL_LIB)/libpythia8powhegHooks.so: $(LOCAL_TMP)/PowhegHooks.o\
|
|
$(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
|
|
$(CXX) $< -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\
|