Blob Blame History Raw
diff -ur pythia8306.orig/configure pythia8306/configure
--- pythia8306.orig/configure	2021-06-29 16:10:32.000000000 +0200
+++ pythia8306/configure	2021-08-16 19:19:07.765741025 +0200
@@ -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 pythia8306.orig/Makefile pythia8306/Makefile
--- pythia8306.orig/Makefile	2021-06-29 16:10:32.000000000 +0200
+++ pythia8306/Makefile	2021-08-16 19:17:22.299480688 +0200
@@ -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,\
@@ -110,7 +110,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 (exclude any executable ending with sh).
 $(LOCAL_TMP)/LHAPowheg.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPowheg.h
@@ -119,8 +119,8 @@
 $(LOCAL_LIB)/libpythia8powheg%.so: $(POWHEG_BIN)% $(LOCAL_TMP)/LHAPowheg.o\
 	$(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
 	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 $<)
+	 -o $@ $(CXX_COMMON) $(CXX_SHARED) $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)\
+	 $(CXX_SONAME)$(notdir $@); rm $(notdir $<)
 
 # MG5 matrix element plugins.
 mg5mes:
diff -ur pythia8306.orig/plugins/python/Makefile pythia8306/plugins/python/Makefile
--- pythia8306.orig/plugins/python/Makefile	2021-06-29 16:10:32.000000000 +0200
+++ pythia8306/plugins/python/Makefile	2021-08-16 19:15:48.495249144 +0200
@@ -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):
@@ -68,11 +69,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)