Hello community, here is the log from the commit of package pythia for openSUSE:Factory checked in at 2016-09-12 13:25:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pythia (Old) and /work/SRC/openSUSE:Factory/.pythia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pythia" Changes: -------- --- /work/SRC/openSUSE:Factory/pythia/pythia.changes 2016-09-07 11:45:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pythia.new/pythia.changes 2016-09-12 13:25:45.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Sep 7 03:45:36 UTC 2016 - [email protected] + +- Modify pythia-remove-rpaths.patch to make disabling rpaths + optional, specified by passing the "--disable-rpath" option to + configure. Pass said option at the %build stage to prevent + rpath usage in build shared libraries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pythia.spec ++++++ --- /var/tmp/diff_new_pack.DLF0bW/_old 2016-09-12 13:25:46.000000000 +0200 +++ /var/tmp/diff_new_pack.DLF0bW/_new 2016-09-12 13:25:46.000000000 +0200 @@ -165,6 +165,7 @@ --prefix-lib=%{_libdir} \ --prefix-share=%{_docdir}/%{name} \ --enable-shared \ + --disable-rpath \ --with-lhapdf6 \ --with-hepmc2 \ --with-boost \ ++++++ pythia-remove-rpaths.patch ++++++ --- /var/tmp/diff_new_pack.DLF0bW/_old 2016-09-12 13:25:46.000000000 +0200 +++ /var/tmp/diff_new_pack.DLF0bW/_new 2016-09-12 13:25:46.000000000 +0200 @@ -2,12 +2,15 @@ =================================================================== --- pythia8219.orig/Makefile +++ pythia8219/Makefile -@@ -55,19 +55,19 @@ ifeq ($(POWHEG_USE),true) +@@ -55,19 +55,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 @@ -15,37 +18,134 @@ # GZIP. OBJ_COMMON=-MD $(CXX_COMMON) -LIB_COMMON=-Wl,-rpath,$(PREFIX_LIB) -ldl -+LIB_COMMON=-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 -+ PYTHON_COMMON+= -L$(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 ################################################################################ -@@ -110,11 +110,11 @@ $(LOCAL_TMP)/LHAPDF%Plugin.o: $(LOCAL_IN +@@ -109,12 +120,22 @@ $(LOCAL_TMP)/LHAPDF%Plugin.o: $(LOCAL_IN + -I$(BOOST_INCLUDE) $(CXX_COMMON) $(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 + -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 + -L$(LHAPDF6_LIB) -Wl,-rpath,$(LHAPDF6_LIB) -lLHAPDF ++else ++ $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME),$(notdir $@)\ + -L$(LHAPDF6_LIB) -lLHAPDF ++endif # POWHEG (exclude any executable ending with sh). $(LOCAL_TMP)/POWHEGPlugin.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPowheg.h -@@ -124,7 +124,7 @@ $(LOCAL_LIB)/libpythia8powheg%.so: $(POW +@@ -122,9 +143,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 $<) -+ $(CXX_SONAME),$(notdir $@) ; rm $(notdir $<) + $(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 $@); rm $(notdir $<) ++endif # Python (turn off all warnings for readability). $(LOCAL_LIB)/pythia8.py: $(LOCAL_INCLUDE)/Pythia8Plugins/PythonWrapper.h +Index: pythia8219/configure +=================================================================== +--- pythia8219.orig/configure ++++ pythia8219/configure +@@ -31,6 +31,7 @@ Configuration options. + --enable-debug : Turn on debugging and disable 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 +@@ -85,7 +86,7 @@ Advanced options. + for OS X. + BLOCKTEXT + OPTIONS="-h --h -help --help --enable-debug --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 +@@ -203,6 +204,7 @@ if [ "$LCG_SET" != true ]; then LCG=x86_ + [ "$ENABLE_DEBUG_SET" = true ] && ENABLE_DEBUG="-g " || ENABLE_DEBUG="-O2 " + [ "$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 +@@ -289,6 +291,7 @@ echo "Configured for $ARCH with the foll + if [ "$ENABLE_DEBUG_SET" = true ]; then echo "--enable-debug"; 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 + +@@ -300,6 +303,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: pythia8219/examples/Makefile +=================================================================== +--- pythia8219.orig/examples/Makefile ++++ pythia8219/examples/Makefile +@@ -20,7 +20,10 @@ + # Handle GZIP support. + ifeq ($(GZIP_USE),true) + CXX_COMMON+= -DGZIPSUPPORT -I$(GZIP_INCLUDE) +- CXX_COMMON+= -L$(GZIP_LIB) -Wl,-rpath,$(GZIP_LIB) -lz ++ CXX_COMMON+= -L$(GZIP_LIB) -lz ++ ifneq ($(DISABLE_RPATH),true) ++ CXX_COMMON+= -Wl,-rpath,$(GZIP_LIB) ++ endif + endif + + # Check distribution (use local version first, then installed version). +@@ -28,7 +31,10 @@ ifneq ("$(wildcard ../lib/libpythia8.a)" + PREFIX_LIB=../lib + PREFIX_INCLUDE=../include + endif +-CXX_COMMON:=-I$(PREFIX_INCLUDE) $(CXX_COMMON) -Wl,-rpath,$(PREFIX_LIB) -ldl ++CXX_COMMON:=-I$(PREFIX_INCLUDE) $(CXX_COMMON) -ldl ++ifneq ($(DISABLE_RPATH),true) ++ CXX_COMMON+= -Wl,-rpath,$(PREFIX_LIB) ++endif + + ################################################################################ + # RULES: Definition of the rules used to build the PYTHIA examples.
