diff -ur pythia8310.orig/configure pythia8310/configure
--- pythia8310.orig/configure 2023-07-25 14:23:30.000000000 +0200
+++ pythia8310/configure 2023-11-25 05:13:56.366397638 +0100
@@ -192,7 +192,6 @@
LIB=${LIB#-L}
if [ "${LIB:0:1}" = "-" ]; then continue; fi
PKG_LIB+=("-L$(cd $LIB 2> /dev/null && pwd -P)")
- PKG_LIB+=("-Wl,-rpath,$(cd $LIB 2> /dev/null && pwd -P)")
done
PKG_CFG[2]="${PKG_INC[@]}"; PKG_CFG[3]="${PKG_LIB[@]}"
diff -ur pythia8310.orig/Makefile pythia8310/Makefile
--- pythia8310.orig/Makefile 2023-07-25 14:23:30.000000000 +0200
+++ pythia8310/Makefile 2023-11-25 05:23:25.726699798 +0100
@@ -36,7 +36,7 @@
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)
+LIB_COMMON=-ldl $(GZIP_LIB)
# PYTHIA.
OBJECTS=$(patsubst $(LOCAL_SRC)/%.cc,$(LOCAL_TMP)/%.o,\
@@ -113,7 +113,7 @@
$(LOCAL_LIB)/libpythia8lhapdf%.so: $(LOCAL_TMP)/LHAPDF%Plugin.o\
$(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
$(CXX) $< -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\
- $(LHAPDF$*_LIB) -lLHAPDF -Llib -lpythia8
+ $(LHAPDF$*_LIB) -lLHAPDF $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
# POWHEG.
$(LOCAL_TMP)/LHAPowheg.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPowheg.h
@@ -123,12 +123,12 @@
$(LOCAL_LIB)/libpythia8powheg%.so: $(POWHEG_BIN)lib%.so\
$(LOCAL_TMP)/LHAPowheg.o $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
$(CXX) $(LOCAL_TMP)/LHAPowheg.o -o $@ $(CXX_COMMON) $(CXX_SHARED)\
- $(CXX_SONAME)$(notdir $@) -Llib -lpythia8\
- -Wl,-rpath,../lib:$(POWHEG_BIN) -L$(POWHEG_BIN) -l$*
+ $(CXX_SONAME)$(notdir $@) $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)\
+ -L$(POWHEG_BIN) -l$*
$(LOCAL_LIB)/libpythia8powhegHooks.so: $(LOCAL_TMP)/PowhegHooks.o\
$(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
$(CXX) $< -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\
- -Llib -lpythia8
+ $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
# MG5 matrix element plugins.
mg5mes:
diff -ur pythia8310.orig/plugins/python/Makefile pythia8310/plugins/python/Makefile
--- pythia8310.orig/plugins/python/Makefile 2023-07-25 14:23:30.000000000 +0200
+++ pythia8310/plugins/python/Makefile 2023-11-25 05:13:56.367397640 +0100
@@ -27,8 +27,9 @@
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)
+LIB_COMMON=-ldl $(GZIP_LIB)
PYTHIA=$(TOP_LIB)/libpythia8$(LIB_SUFFIX)
+PYTHON_EXT_SUFFIX=.so
# Determine the headers.
HEADERS=$(patsubst ../../include/Pythia8%.h,$(LOCAL_INCLUDE)/Pythia8%.h,\
@@ -46,7 +47,7 @@
.PHONY: all clean
# All targets.
-all: $(TOP_LIB)/pythia8.so
+all: $(TOP_LIB)/pythia8$(PYTHON_EXT_SUFFIX)
# PYTHIA library.
$(PYTHIA):
@@ -75,11 +76,11 @@
$(CXX) $< -o $@ -c $(OBJ_COMMON)
# Build the library.
-$(TOP_LIB)/pythia8.so: $(PYTHIA) $(HEADERS) $(OBJECTS)
+$(TOP_LIB)/pythia8$(PYTHON_EXT_SUFFIX): $(PYTHIA) $(HEADERS) $(OBJECTS)
$(CXX) $(OBJECTS) -o $@ $(CXX_COMMON) $(CXX_SHARED)\
- $(CXX_SONAME)$(notdir $@) $(LIB_COMMON) -L$(TOP_LIB)\
- -Wl,-rpath,$(PREFIX_LIB) -lpythia8 -Wl,-undefined,dynamic_lookup
+ $(CXX_SONAME)$(notdir $@) $(LIB_COMMON)\
+ $(PYTHIA) -Wl,-undefined,dynamic_lookup
# Clean.
clean:
- rm -rf $(LOCAL_TMP) $(TOP_LIB)/pythia8.so
+ rm -rf $(LOCAL_TMP) $(TOP_LIB)/pythia8$(PYTHON_EXT_SUFFIX)