7f20abe
diff -ur pythia8243.orig/Makefile pythia8243/Makefile
7f20abe
--- pythia8243.orig/Makefile	2019-07-05 11:02:34.000000000 +0200
7f20abe
+++ pythia8243/Makefile	2019-07-05 20:12:08.875161403 +0200
7f20abe
@@ -64,19 +64,19 @@
cd9c5f7
 endif
fa2915f
 
cd9c5f7
 # Python.
cd9c5f7
-PYTHON_COMMON=-I$(PYTHON_INCLUDE) $(CXX_COMMON) -Wl,-rpath,$(PREFIX_LIB)
cd9c5f7
+PYTHON_COMMON=-I$(PYTHON_INCLUDE) $(CXX_COMMON)
cd9c5f7
 ifeq ($(PYTHON_USE),true)
cd9c5f7
   TARGETS+=$(LOCAL_LIB)/_pythia8.so
cd9c5f7
 endif
cd9c5f7
 
cd9c5f7
 # GZIP.
cd9c5f7
 OBJ_COMMON=-MD $(CXX_COMMON)
cd9c5f7
-LIB_COMMON=-Wl,-rpath,$(PREFIX_LIB) -ldl
cd9c5f7
+LIB_COMMON=-ldl
cd9c5f7
 ifeq ($(GZIP_USE),true)
cd9c5f7
   PYTHON_COMMON+= -DGZIPSUPPORT -I$(GZIP_INCLUDE)
cd9c5f7
-  PYTHON_COMMON+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz
cd9c5f7
+  PYTHON_COMMON+= -L$(GZIP_LIB) -lz
cd9c5f7
   OBJ_COMMON+= -DGZIPSUPPORT -I$(GZIP_INCLUDE)
cd9c5f7
-  LIB_COMMON+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz
cd9c5f7
+  LIB_COMMON+= -L$(GZIP_LIB) -lz
cd9c5f7
 endif
cd9c5f7
 
cd9c5f7
 ################################################################################
7f20abe
@@ -117,23 +117,23 @@
7f20abe
 $(LOCAL_TMP)/LHAPDF%Plugin.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPDF%.h
7f20abe
 	$(CXX) -x c++ $< -o $@ -c -MD -w $(CXX_LHAPDF)
fa2915f
 $(LOCAL_LIB)/libpythia8lhapdf5.so: $(LOCAL_TMP)/LHAPDF5Plugin.o\
fa2915f
-	$(LOCAL_LIB)/libpythia8.a
fa2915f
+	$(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
cd9c5f7
 	$(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\
cd9c5f7
-	 -L$(LHAPDF5_LIB) -Wl,-rpath,$(LHAPDF5_LIB) -lLHAPDF -lgfortran
fa2915f
+	 -L$(LHAPDF5_LIB) -lLHAPDF -lgfortran
fa2915f
 $(LOCAL_LIB)/libpythia8lhapdf6.so: $(LOCAL_TMP)/LHAPDF6Plugin.o\
fa2915f
-	$(LOCAL_LIB)/libpythia8.a
fa2915f
+	$(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
cd9c5f7
 	$(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\
cd9c5f7
-	 -L$(LHAPDF6_LIB) -Wl,-rpath,$(LHAPDF6_LIB) -lLHAPDF
fa2915f
+	 -L$(LHAPDF6_LIB) -lLHAPDF
fa2915f
 
fa2915f
 # POWHEG (exclude any executable ending with sh).
fa2915f
 $(LOCAL_TMP)/POWHEGPlugin.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPowheg.h
cd9c5f7
 	$(CXX) -x c++ $< -o $@ -c -MD -w $(CXX_COMMON)
fa2915f
 $(LOCAL_LIB)/libpythia8powheg%sh.so: $(POWHEG_BIN)/%sh;
fa2915f
 $(LOCAL_LIB)/libpythia8powheg%.so: $(POWHEG_BIN)/% $(LOCAL_TMP)/POWHEGPlugin.o\
fa2915f
-	$(LOCAL_LIB)/libpythia8.a
fa2915f
+	$(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
fa2915f
 	ln -s $< $(notdir $<); $(CXX) $(notdir $<) $(LOCAL_TMP)/POWHEGPlugin.o\
fa2915f
-	 $(LOCAL_LIB)/libpythia8.a -o $@ $(CXX_COMMON) $(CXX_SHARED)\
cd9c5f7
-	 $(CXX_SONAME)$(notdir $@) -Wl,-rpath,$(POWHEG_BIN); rm $(notdir $<)
fa2915f
+	 $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX) -o $@ $(CXX_COMMON) $(CXX_SHARED)\
cd9c5f7
+	 $(CXX_SONAME)$(notdir $@); rm $(notdir $<)
cd9c5f7
 
cd9c5f7
 # Python (turn off all warnings for readability).
cd9c5f7
 $(LOCAL_LIB)/pythia8.py: $(LOCAL_INCLUDE)/Pythia8Plugins/PythonWrapper.h
7f20abe
@@ -144,8 +144,7 @@
cd9c5f7
 	$(LOCAL_LIB)/pythia8.py $(wildcard $(LOCAL_INCLUDE)/*/*.h) |\
cd9c5f7
 	$(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
cd9c5f7
 	$(CXX) -x c++ $< -o $@ -w $(PYTHON_COMMON) $(CXX_SHARED)\
cd9c5f7
-	 -Wl,-undefined,dynamic_lookup -Wno-long-long\
cd9c5f7
-	 $(CXX_SONAME)$(notdir $@) -L$(LOCAL_LIB) -lpythia8
cd9c5f7
+	$(CXX_SONAME)$(notdir $@) $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX)
fa2915f
 
fa2915f
 # Install (rsync is used for finer control).
fa2915f
 install: all