Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.1:ARM
pythia
pythia-remove-rpaths.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File pythia-remove-rpaths.patch of Package pythia
Index: pythia8235/Makefile =================================================================== --- pythia8235.orig/Makefile +++ pythia8235/Makefile @@ -58,19 +58,30 @@ ifeq ($(POWHEG_USE),true) endif # Python. -PYTHON_COMMON=-I$(PYTHON_INCLUDE) $(CXX_COMMON) -Wl,-rpath,$(PREFIX_LIB) +PYTHON_COMMON=-I$(PYTHON_INCLUDE) $(CXX_COMMON) +ifneq ($(DISABLE_RPATH),true) + PYTHON_COMMON+= -Wl,-rpath,$(PREFIX_LIB) +endif ifeq ($(PYTHON_USE),true) TARGETS+=$(LOCAL_LIB)/_pythia8.so endif # GZIP. OBJ_COMMON=-MD $(CXX_COMMON) -LIB_COMMON=-Wl,-rpath,$(PREFIX_LIB) -ldl +ifneq ($(DISABLE_RPATH),true) + LIB_COMMON=-Wl,-rpath,$(PREFIX_LIB) -ldl +else + LIB_COMMON=-ldl +endif ifeq ($(GZIP_USE),true) PYTHON_COMMON+= -DGZIPSUPPORT -I$(GZIP_INCLUDE) - PYTHON_COMMON+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz OBJ_COMMON+= -DGZIPSUPPORT -I$(GZIP_INCLUDE) - LIB_COMMON+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz + ifneq ($(DISABLE_RPATH),true) + LIB_COMMON+= -Wl,-rpath,$(GZIP_LIB) + PYTHON_COMMON+= -Wl,-rpath,$(GZIP_LIB) + endif + PYTHON_COMMON+= -L$(GZIP_LIB) -lz + LIB_COMMON+= -L$(GZIP_LIB) -lz endif ################################################################################ @@ -113,12 +124,22 @@ $(LOCAL_TMP)/LHAPDF%Plugin.o: $(LOCAL_IN -I$(BOOST_INCLUDE) $(LOCAL_LIB)/libpythia8lhapdf5.so: $(LOCAL_TMP)/LHAPDF5Plugin.o\ $(LOCAL_LIB)/libpythia8.a +ifneq ($(DISABLE_RPATH),true) $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ -L$(LHAPDF5_LIB) -Wl,-rpath,$(LHAPDF5_LIB) -lLHAPDF -lgfortran +else + $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ + -L$(LHAPDF5_LIB) -lLHAPDF -lgfortran +endif $(LOCAL_LIB)/libpythia8lhapdf6.so: $(LOCAL_TMP)/LHAPDF6Plugin.o\ $(LOCAL_LIB)/libpythia8.a +ifneq ($(DISABLE_RPATH),true) + $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ + -L$(LHAPDF6_LIB) -Wl,-rpath,$(LHAPDF6_LIB) -lLHAPDF +else $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ - -L$(LHAPDF6_LIB) -Wl,-rpath,$(LHAPDF6_LIB) -lLHAPDF + -L$(LHAPDF6_LIB) -lLHAPDF +endif # POWHEG (exclude any executable ending with sh). $(LOCAL_TMP)/POWHEGPlugin.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPowheg.h @@ -126,9 +147,15 @@ $(LOCAL_TMP)/POWHEGPlugin.o: $(LOCAL_INC $(LOCAL_LIB)/libpythia8powheg%sh.so: $(POWHEG_BIN)/%sh; $(LOCAL_LIB)/libpythia8powheg%.so: $(POWHEG_BIN)/% $(LOCAL_TMP)/POWHEGPlugin.o\ $(LOCAL_LIB)/libpythia8.a +ifneq ($(DISABLE_RPATH),true) + ln -s $< $(notdir $<); $(CXX) $(notdir $<) $(LOCAL_TMP)/POWHEGPlugin.o\ + $(LOCAL_LIB)/libpythia8.a -o $@ $(CXX_COMMON) $(CXX_SHARED)\ + $(CXX_SONAME)$(notdir $@) -Wl,-rpath,$(POWHEG_BIN); rm $(notdir $<) +else ln -s $< $(notdir $<); $(CXX) $(notdir $<) $(LOCAL_TMP)/POWHEGPlugin.o\ $(LOCAL_LIB)/libpythia8.a -o $@ $(CXX_COMMON) $(CXX_SHARED)\ - $(CXX_SONAME)$(notdir $@) -Wl,-rpath,$(POWHEG_BIN); rm $(notdir $<) + $(CXX_SONAME)$(notdir $@); rm $(notdir $<) +endif # Python (turn off all warnings for readability). $(LOCAL_LIB)/pythia8.py: $(LOCAL_INCLUDE)/Pythia8Plugins/PythonWrapper.h Index: pythia8235/configure =================================================================== --- pythia8235.orig/configure +++ pythia8235/configure @@ -32,6 +32,7 @@ Configuration options. --enable-optdebug : Turn on debugging but allow optimization. --enable-64bit : Turn on 64-bit compilation. --enable-shared : Build the shared PYTHIA library during compilation. +--disable-rpath : Disable use of rpath for linking. --lcg=PLATFORM : Specify the LCG platform to use when the --with-PACKAGE-version option, described below, is set for a given optional package [x86_64-slc6-gcc48-opt]. The packages @@ -83,7 +84,7 @@ Advanced options. for OS X. BLOCKTEXT OPTIONS="-h --h -help --help --enable-debug --enable-optdebug --enable-64bit" -OPTIONS+=" --enable-shared --lcg" +OPTIONS+=" --enable-shared --disable-rpath --lcg" OPTIONS+=" --prefix --prefix-bin --prefix-lib --prefix-include --prefix-share" for PKG in "evtgen" "fastjet3" "hepmc2" "hepmc3" "lhapdf5" "lhapdf6" "powheg"\ "promc" "root" "gzip" "boost" "python"; do @@ -201,6 +202,7 @@ if [ "$LCG_SET" != true ]; then LCG=x86_ [ "$ENABLE_OPTDEBUG_SET" = true ] && ENABLE_DEBUG="-g -O " [ "$ENABLE_64BIT_SET" = true ] && ENABLE_64BIT="-m64 " || ENABLE_64BIT="" [ "$ENABLE_SHARED_SET" = true ] && ENABLE_SHARED="true" || ENABLE_SHARED="false" +[ "$DISABLE_RPATH_SET" = true ] && DISABLE_RPATH="true" || DISABLE_RPATH="false" if [ -z "$ARCH" ]; then ARCH=$(uname | grep -i -o -e Linux -e Darwin); fi ARCH=$(echo $ARCH | awk '{print toupper($0)}') if [ "$ARCH" != "LINUX" ] && [ "$ARCH" != "DARWIN" ]; then @@ -282,6 +284,7 @@ if [ "$ENABLE_DEBUG_SET" = true ]; then if [ "$ENABLE_OPTDEBUG_SET" = true ]; then echo "--enable-optdebug"; fi if [ "$ENABLE_64BIT_SET" = true ]; then echo "--enable-64bit"; fi if [ "$ENABLE_SHARED_SET" = true ]; then echo "--enable-shared"; fi +if [ "$DISABLE_RPATH_SET" = true ]; then echo "--disable-rpath"; fi if [ "$LCG_SET" = true ]; then echo "--lcg=$LCG"; fi cat >> $CFG_FILE << BLOCKTEXT @@ -293,6 +296,7 @@ PREFIX_SHARE=$PREFIX_SHARE # Compilation flags (see ./configure --help for further documentation). ENABLE_SHARED=$ENABLE_SHARED +DISABLE_RPATH=$DISABLE_RPATH CXX=$CXX CXX_COMMON=$CXX_COMMON CXX_SHARED=$CXX_SHARED Index: pythia8235/examples/Makefile =================================================================== --- pythia8235.orig/examples/Makefile +++ pythia8235/examples/Makefile @@ -25,7 +25,10 @@ GZIP_INC= GZIP_FLAGS= ifeq ($(GZIP_USE),true) GZIP_INC+= -DGZIPSUPPORT -I$(GZIP_INCLUDE) - GZIP_FLAGS+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz + GZIP_FLAGS+= -L$(GZIP_LIB) -lz + ifneq ($(DISABLE_RPATH),true) + GZIP_FLAGS+= -Wl,-rpath,$(GZIP_LIB) + endif endif # Check distribution (use local version first, then installed version).
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor