Date: Sunday, March 3, 2019 @ 14:01:33 Author: kgizdov Revision: 437462
archrelease: copy trunk to community-x86_64 Added: pythia8/repos/community-x86_64/PKGBUILD (from rev 437461, pythia8/trunk/PKGBUILD) pythia8/repos/community-x86_64/fix_lhapdf_build.patch (from rev 437461, pythia8/trunk/fix_lhapdf_build.patch) pythia8/repos/community-x86_64/pythia8.sh (from rev 437461, pythia8/trunk/pythia8.sh) pythia8/repos/community-x86_64/respect_lib_suffix.patch (from rev 437461, pythia8/trunk/respect_lib_suffix.patch) Deleted: pythia8/repos/community-x86_64/PKGBUILD pythia8/repos/community-x86_64/change_to_python2.patch pythia8/repos/community-x86_64/fix_lhapdf_build.patch pythia8/repos/community-x86_64/pythia8.sh pythia8/repos/community-x86_64/respect_lib_suffix.patch --------------------------+ PKGBUILD | 321 +++++++++++++++++---------------------------- change_to_python2.patch | 12 - fix_lhapdf_build.patch | 24 +-- pythia8.sh | 6 respect_lib_suffix.patch | 282 +++++++++++++++++++-------------------- 5 files changed, 282 insertions(+), 363 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-03-03 14:00:48 UTC (rev 437461) +++ PKGBUILD 2019-03-03 14:01:33 UTC (rev 437462) @@ -1,195 +0,0 @@ -# Maintainer: Konstantin Gizdov < arch at kge dot pw > -# Contributor: Joshua Ellis < josh at jpellis dot me > -# Contributor: Stefano Campanella < stefanocampanella1729 at gmail dot com > - -pkgbase=pythia8 -pkgname=('pythia8' 'python-pythia8' 'python2-pythia8') -pkgver=8.2.40 -_pkgid="${pkgbase:0:-1}${pkgver//./}" -pkgrel=7 -pkgdesc="High-energy physics events generator." -arch=('x86_64') -url="http://home.thep.lu.se/Pythia/" -license=('GPL') -depends=('python') -makedepends=('python' 'python2' 'fastjet' 'hepmc' 'lhapdf>=6.2' 'root') -source=("http://home.thep.lu.se/~torbjorn/pythia8/${_pkgid}.tgz" - 'pythia8.sh' - 'change_to_python2.patch' - 'fix_lhapdf_build.patch' - 'respect_lib_suffix.patch') -sha256sums=('d27495d8ca7707d846f8c026ab695123c7c78c7860f04e2c002e483080418d8d' - '4e373b685960e410024b4e33e22c2dea360dfedd7962837087332f428c974ae5' - 'bae1a65399cd2ee599db1758d60da2a1c93335ec4dbd30e323250c156f491086' - 'f7c70b069b350005ac7e9028617713dece9b82c1e8b0dc5fb1f2870abec1d94c' - '4eb15725cfb5e287fdd9520cb4211b88ebc38a690b7522690ba0664d50bc8669') -get_pyver () { - python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))' -} - -get_py2ver () { - python2 -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))' -} - -prepare() { - cd "${srcdir}/${_pkgid}" - patch -p1 -i "${srcdir}/respect_lib_suffix.patch" - patch -p1 -i "${srcdir}/fix_lhapdf_build.patch" - - cd "${srcdir}" - cp -r "${_pkgid}" "${_pkgid}-py2" - - cd "${srcdir}/${_pkgid}-py2" - patch -p1 -i "${srcdir}/change_to_python2.patch" -} - -build() { - _inc=/usr/include - _lib=/usr/lib - _share=/usr/share/${pkgbase} - - # with Python3 - cd "${srcdir}/${_pkgid}" - # # no such package yet - # --with-evtgen \ - # --with-evtgen-include=${_inc} \ - # --with-evtgen-lib=${_lib} \ - # # no such package yet - # --with-hepmc3 \ - # --with-hepmc3-include=${_inc} \ - # --with-hepmc3-lib=${_lib} \ - # # no such package yet - # --with-powheg \ - # --with-powheg-include=${_inc} \ - # --with-powheg-lib=${_lib} \ - # # no such package yet - # --with-promc \ - # --with-promc-include=${_inc} \ - # --with-promc-lib=${_lib} \ - ./configure --prefix=/usr \ - --prefix-include=${_inc} \ - --prefix-lib=${_lib} \ - --prefix-share=${_share} \ - --cxx-common="${CXXFLAGS} -fPIC" \ - --cxx-shared="-shared ${LDFLAGS} -ldl" \ - --enable-shared \ - --with-fastjet3 \ - --with-fastjet3-include=${_inc} \ - --with-fastjet3-lib=${_lib} \ - --with-gzip \ - --with-gzip-include=${_inc} \ - --with-gzip-lib=${_lib} \ - --with-hepmc2 \ - --with-hepmc2-include=${_inc} \ - --with-hepmc2-lib=${_lib} \ - --with-lhapdf5 \ - --with-lhapdf5-include=${_inc} \ - --with-lhapdf5-lib=${_lib} \ - --with-lhapdf6 \ - --with-lhapdf6-include=${_inc} \ - --with-lhapdf6-lib=${_lib} \ - --with-python \ - --with-python-include="/usr/include/python$(get_pyver)m" \ - --with-python-lib="/usr/lib/python$(get_pyver)" \ - --with-root \ - --with-root-include=/usr/include/root \ - --with-root-lib=/usr/lib/root - cd "${srcdir}/${_pkgid}" - make - - # with Python2 - cd "${srcdir}/${_pkgid}-py2" - # # no such package yet - # --with-evtgen \ - # --with-evtgen-include=${_inc} \ - # --with-evtgen-lib=${_lib} \ - # # no such package yet - # --with-hepmc3 \ - # --with-hepmc3-include=${_inc} \ - # --with-hepmc3-lib=${_lib} \ - # # no such package yet - # --with-powheg \ - # --with-powheg-include=${_inc} \ - # --with-powheg-lib=${_lib} \ - # # no such package yet - # --with-promc \ - # --with-promc-include=${_inc} \ - # --with-promc-lib=${_lib} \ - ./configure --prefix=/usr \ - --prefix-include=${_inc} \ - --prefix-lib=${_lib} \ - --prefix-share=${_share} \ - --cxx-common="${CXXFLAGS} -fPIC" \ - --cxx-shared="-shared ${LDFLAGS} -ldl" \ - --enable-shared \ - --with-fastjet3 \ - --with-fastjet3-include=${_inc} \ - --with-fastjet3-lib=${_lib} \ - --with-gzip \ - --with-gzip-include=${_inc} \ - --with-gzip-lib=${_lib} \ - --with-hepmc2 \ - --with-hepmc2-include=${_inc} \ - --with-hepmc2-lib=${_lib} \ - --with-lhapdf5 \ - --with-lhapdf5-include=${_inc} \ - --with-lhapdf5-lib=${_lib} \ - --with-lhapdf6 \ - --with-lhapdf6-include=${_inc} \ - --with-lhapdf6-lib=${_lib} \ - --with-python \ - --with-python-include="/usr/include/python$(get_py2ver)" \ - --with-python-lib="/usr/lib/python$(get_py2ver)" \ - --with-root \ - --with-root-include=/usr/include/root \ - --with-root-lib=/usr/lib/root - cd "${srcdir}/${_pkgid}-py2" - make -} - -package_pythia8() { - pkgdesc="High-energy physics events generator." - provides=('pythia') - conflicts=('pythia') - replaces=('pythia') - depends=('python') - optdepends=('fastjet: fast jet finding in pp and e+e- collisions' - 'hepmc: storing collisions from Monte Carlo' - 'lhapdf: evaluate PDFs from discretised data files' - 'root: integrated examples with CERN ROOT data analysis framework') - cd "${srcdir}/${_pkgid}" - install -Dm755 bin/pythia8-config "${pkgdir}/usr/bin/pythia8-config" - install -Dm644 lib/libpythia8.a "${pkgdir}/usr/lib/libpythia8.a" - install -Dm755 lib/libpythia8.so "${pkgdir}/usr/lib/libpythia8.so" - install -Dm755 lib/libpythia8lhapdf5.so "${pkgdir}/usr/lib/libpythia8lhapdf5.so" - install -Dm755 lib/libpythia8lhapdf6.so "${pkgdir}/usr/lib/libpythia8lhapdf6.so" - - cp -r include "${pkgdir}/usr/" - install -d "${pkgdir}/usr/share/${pkgbase}" - cp -r share/Pythia8/* "${pkgdir}/usr/share/${pkgbase}/" - cp -r examples "${pkgdir}/usr/share/${pkgbase}/" - - install -D "${srcdir}/pythia8.sh" "${pkgdir}/etc/profile.d/pythia8.sh" - - cd "${pkgdir}/usr/lib" -} - -package_python-pythia8() { - pkgdesc="Python bindings for Pythia." - depends=('pythia') - cd "${srcdir}/${_pkgid}" - - install -Dm755 lib/_pythia8.so "${pkgdir}/usr/lib/python$(get_pyver)/site-packages/_pythia8.so" - install -Dm755 lib/pythia8.py "${pkgdir}/usr/lib/python$(get_pyver)/site-packages/pythia8.py" - install -Dm644 lib/__pycache__/pythia8.cpython-37.pyc "${pkgdir}/usr/lib/python$(get_pyver)/site-packages/__pycache__/pythia8.cpython-37.pyc" -} - -package_python2-pythia8() { - pkgdesc="Python2 bindings for Pythia." - depends=('pythia') - cd "${srcdir}/${_pkgid}-py2" - - install -Dm755 lib/_pythia8.so "${pkgdir}/usr/lib/python$(get_py2ver)/site-packages/_pythia8.so" - install -Dm755 lib/pythia8.py "${pkgdir}/usr/lib/python$(get_py2ver)/site-packages/pythia8.py" - install -Dm644 lib/pythia8.pyc "${pkgdir}/usr/lib/python$(get_py2ver)/site-packages/pythia8.pyc" -} Copied: pythia8/repos/community-x86_64/PKGBUILD (from rev 437461, pythia8/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-03-03 14:01:33 UTC (rev 437462) @@ -0,0 +1,126 @@ +# Maintainer: Konstantin Gizdov < arch at kge dot pw > +# Contributor: Joshua Ellis < josh at jpellis dot me > +# Contributor: Stefano Campanella < stefanocampanella1729 at gmail dot com > + +pkgbase=pythia8 +pkgname=('pythia8' 'python-pythia8') +pkgver=8.2.40 +_pkgid="${pkgbase:0:-1}${pkgver//./}" +pkgrel=8 +pkgdesc="High-energy physics events generator." +arch=('x86_64') +url="http://home.thep.lu.se/Pythia/" +license=('GPL') +depends=('python') +makedepends=('python' 'fastjet' 'hepmc' 'lhapdf>=6.2' 'root') +source=("http://home.thep.lu.se/~torbjorn/pythia8/${_pkgid}.tgz" + 'pythia8.sh' + 'change_to_python2.patch' + 'fix_lhapdf_build.patch' + 'respect_lib_suffix.patch') +sha256sums=('d27495d8ca7707d846f8c026ab695123c7c78c7860f04e2c002e483080418d8d' + '4e373b685960e410024b4e33e22c2dea360dfedd7962837087332f428c974ae5' + 'bae1a65399cd2ee599db1758d60da2a1c93335ec4dbd30e323250c156f491086' + 'f7c70b069b350005ac7e9028617713dece9b82c1e8b0dc5fb1f2870abec1d94c' + '4eb15725cfb5e287fdd9520cb4211b88ebc38a690b7522690ba0664d50bc8669') +get_pyver () { + python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))' +} + +prepare() { + cd "${srcdir}/${_pkgid}" + patch -p1 -i "${srcdir}/respect_lib_suffix.patch" + patch -p1 -i "${srcdir}/fix_lhapdf_build.patch" +} + +build() { + _inc=/usr/include + _lib=/usr/lib + _share=/usr/share/${pkgbase} + + # with Python3 + cd "${srcdir}/${_pkgid}" + # # no such package yet + # --with-evtgen \ + # --with-evtgen-include=${_inc} \ + # --with-evtgen-lib=${_lib} \ + # # no such package yet + # --with-hepmc3 \ + # --with-hepmc3-include=${_inc} \ + # --with-hepmc3-lib=${_lib} \ + # # no such package yet + # --with-powheg \ + # --with-powheg-include=${_inc} \ + # --with-powheg-lib=${_lib} \ + # # no such package yet + # --with-promc \ + # --with-promc-include=${_inc} \ + # --with-promc-lib=${_lib} \ + ./configure --prefix=/usr \ + --prefix-include=${_inc} \ + --prefix-lib=${_lib} \ + --prefix-share=${_share} \ + --cxx-common="${CXXFLAGS} -fPIC" \ + --cxx-shared="-shared ${LDFLAGS} -ldl" \ + --enable-shared \ + --with-fastjet3 \ + --with-fastjet3-include=${_inc} \ + --with-fastjet3-lib=${_lib} \ + --with-gzip \ + --with-gzip-include=${_inc} \ + --with-gzip-lib=${_lib} \ + --with-hepmc2 \ + --with-hepmc2-include=${_inc} \ + --with-hepmc2-lib=${_lib} \ + --with-lhapdf5 \ + --with-lhapdf5-include=${_inc} \ + --with-lhapdf5-lib=${_lib} \ + --with-lhapdf6 \ + --with-lhapdf6-include=${_inc} \ + --with-lhapdf6-lib=${_lib} \ + --with-python \ + --with-python-include="/usr/include/python$(get_pyver)m" \ + --with-python-lib="/usr/lib/python$(get_pyver)" \ + --with-root \ + --with-root-include=/usr/include/root \ + --with-root-lib=/usr/lib/root + cd "${srcdir}/${_pkgid}" + make +} + +package_pythia8() { + pkgdesc="High-energy physics events generator." + provides=('pythia') + conflicts=('pythia') + replaces=('pythia') + depends=('python') + optdepends=('fastjet: fast jet finding in pp and e+e- collisions' + 'hepmc: storing collisions from Monte Carlo' + 'lhapdf: evaluate PDFs from discretised data files' + 'root: integrated examples with CERN ROOT data analysis framework') + cd "${srcdir}/${_pkgid}" + install -Dm755 bin/pythia8-config "${pkgdir}/usr/bin/pythia8-config" + install -Dm644 lib/libpythia8.a "${pkgdir}/usr/lib/libpythia8.a" + install -Dm755 lib/libpythia8.so "${pkgdir}/usr/lib/libpythia8.so" + install -Dm755 lib/libpythia8lhapdf5.so "${pkgdir}/usr/lib/libpythia8lhapdf5.so" + install -Dm755 lib/libpythia8lhapdf6.so "${pkgdir}/usr/lib/libpythia8lhapdf6.so" + + cp -r include "${pkgdir}/usr/" + install -d "${pkgdir}/usr/share/${pkgbase}" + cp -r share/Pythia8/* "${pkgdir}/usr/share/${pkgbase}/" + cp -r examples "${pkgdir}/usr/share/${pkgbase}/" + + install -D "${srcdir}/pythia8.sh" "${pkgdir}/etc/profile.d/pythia8.sh" + + cd "${pkgdir}/usr/lib" +} + +package_python-pythia8() { + pkgdesc="Python bindings for Pythia." + depends=('pythia') + cd "${srcdir}/${_pkgid}" + + install -Dm755 lib/_pythia8.so "${pkgdir}/usr/lib/python$(get_pyver)/site-packages/_pythia8.so" + install -Dm755 lib/pythia8.py "${pkgdir}/usr/lib/python$(get_pyver)/site-packages/pythia8.py" + install -Dm644 lib/__pycache__/pythia8.cpython-37.pyc "${pkgdir}/usr/lib/python$(get_pyver)/site-packages/__pycache__/pythia8.cpython-37.pyc" +} Deleted: change_to_python2.patch =================================================================== --- change_to_python2.patch 2019-03-03 14:00:48 UTC (rev 437461) +++ change_to_python2.patch 2019-03-03 14:01:33 UTC (rev 437462) @@ -1,12 +0,0 @@ -diff -aur pythia8235-old/Makefile pythia8235-new/Makefile ---- pythia8235-old/Makefile 2018-11-28 00:54:49.657105842 +0000 -+++ pythia8235-new/Makefile 2018-11-28 00:54:26.030804438 +0000 -@@ -134,7 +134,7 @@ - $(LOCAL_LIB)/pythia8.py: $(LOCAL_INCLUDE)/Pythia8Plugins/PythonWrapper.h - SPLIT=`grep -n "PYTHON SOURCE" $< | cut -d : -f 1`;\ - SPLIT=$$[$$SPLIT+1]; tail -n +$$SPLIT $< | cut -d "/" -f 3- > $@ -- $(PYTHON_BIN)python -m compileall $(LOCAL_LIB) -+ $(PYTHON_BIN)python2 -m compileall $(LOCAL_LIB) - $(LOCAL_LIB)/_pythia8.so: $(LOCAL_INCLUDE)/Pythia8Plugins/PythonWrapper.h\ - $(LOCAL_LIB)/pythia8.py $(wildcard $(LOCAL_INCLUDE)/*/*.h) |\ - $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX) Deleted: fix_lhapdf_build.patch =================================================================== --- fix_lhapdf_build.patch 2019-03-03 14:00:48 UTC (rev 437461) +++ fix_lhapdf_build.patch 2019-03-03 14:01:33 UTC (rev 437462) @@ -1,12 +0,0 @@ -diff -aur pythia8235-old/Makefile pythia8235-new/Makefile ---- pythia8235-old/Makefile 2018-03-27 18:15:17.000000000 +0100 -+++ pythia8235-new/Makefile 2018-11-27 23:42:13.813863630 +0000 -@@ -102,7 +102,7 @@ - $(CXX) $< -o $@ -c $(OBJ_COMMON) - $(LOCAL_LIB)/libpythia8.a: $(OBJECTS) - rm -f $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX) -- ar cru $@ $^ -+ ar rcs $@ $^ - $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX): $(OBJECTS) - $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ - $(LIB_COMMON) Copied: pythia8/repos/community-x86_64/fix_lhapdf_build.patch (from rev 437461, pythia8/trunk/fix_lhapdf_build.patch) =================================================================== --- fix_lhapdf_build.patch (rev 0) +++ fix_lhapdf_build.patch 2019-03-03 14:01:33 UTC (rev 437462) @@ -0,0 +1,12 @@ +diff -aur pythia8235-old/Makefile pythia8235-new/Makefile +--- pythia8235-old/Makefile 2018-03-27 18:15:17.000000000 +0100 ++++ pythia8235-new/Makefile 2018-11-27 23:42:13.813863630 +0000 +@@ -102,7 +102,7 @@ + $(CXX) $< -o $@ -c $(OBJ_COMMON) + $(LOCAL_LIB)/libpythia8.a: $(OBJECTS) + rm -f $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX) +- ar cru $@ $^ ++ ar rcs $@ $^ + $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX): $(OBJECTS) + $(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\ + $(LIB_COMMON) Deleted: pythia8.sh =================================================================== --- pythia8.sh 2019-03-03 14:00:48 UTC (rev 437461) +++ pythia8.sh 2019-03-03 14:01:33 UTC (rev 437462) @@ -1,3 +0,0 @@ -# /etc/profile.d/pythia8.sh -export PYTHIA8=/usr -export PYTHIA8DATA=$PYTHIA8/share/pythia8/xmldoc Copied: pythia8/repos/community-x86_64/pythia8.sh (from rev 437461, pythia8/trunk/pythia8.sh) =================================================================== --- pythia8.sh (rev 0) +++ pythia8.sh 2019-03-03 14:01:33 UTC (rev 437462) @@ -0,0 +1,3 @@ +# /etc/profile.d/pythia8.sh +export PYTHIA8=/usr +export PYTHIA8DATA=$PYTHIA8/share/pythia8/xmldoc Deleted: respect_lib_suffix.patch =================================================================== --- respect_lib_suffix.patch 2019-03-03 14:00:48 UTC (rev 437461) +++ respect_lib_suffix.patch 2019-03-03 14:01:33 UTC (rev 437462) @@ -1,141 +0,0 @@ -diff -aur pythia8235-old/examples/Makefile pythia8235-new/examples/Makefile ---- pythia8235-new/examples/Makefile 2018-03-27 19:15:17.000000000 +0200 -+++ pythia8235-new/examples/Makefile 2018-04-16 13:45:00.155056245 +0200 -@@ -54,20 +54,20 @@ - in the top PYTHIA directory) - - # PYTHIA libraries. --$(PREFIX_LIB)/libpythia8.a : -+$(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) : - $(error Error: PYTHIA must be built, please run "make"\ - in the top PYTHIA directory) - - # Examples without external dependencies. --main% : main%.cc $(PREFIX_LIB)/libpythia8.a -+main% : main%.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - $(CXX) $< -o $@ $(CXX_COMMON) $(GZIP_INC) $(GZIP_FLAGS) - - # MixMax. --main23: $$@.cc $(PREFIX_LIB)/libpythia8.a -+main23: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - $(CXX) $< -o $@ -std=c++11 -w $(CXX_COMMON) $(GZIP_INC) $(GZIP_FLAGS) - - # GZIP (required). --main34: $$@.cc $(PREFIX_LIB)/libpythia8.a -+main34: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - ifeq ($(GZIP_USE),true) - $(CXX) $< -o $@ $(CXX_COMMON) $(GZIP_INC) $(GZIP_FLAGS) - else -@@ -76,7 +76,7 @@ - - # HEPMC2. - main41 main42 main43 main85 main86 main87 main88 main89: $$@.cc\ -- $(PREFIX_LIB)/libpythia8.a -+ $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - ifeq ($(HEPMC2_USE),true) - $(CXX) $< -o $@ -I$(HEPMC2_INCLUDE) $(CXX_COMMON)\ - -L$(HEPMC2_LIB) -Wl,-rpath,$(HEPMC2_LIB) -lHepMC\ -@@ -86,7 +86,7 @@ - endif - - # PROMC. --main46: $$@.cc $(PREFIX_LIB)/libpythia8.a -+main46: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - ifeq ($(PROMC_USE),true) - $(CXX) $< -o $@ -I$(PROMC_INCLUDE)/src -I$(PROMC_INCLUDE)/include\ - $(CXX_COMMON) -DPROMC=\"$(PROMC_INCLUDE)\" -Wno-long-long\ -@@ -97,7 +97,7 @@ - endif - - # EVTGEN (and HEPMC2). --main48: $$@.cc $(PREFIX_LIB)/libpythia8.a -+main48: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - ifeq ($(EVTGEN_USE)$(HEPMC2_USE)$(ENABLE_SHARED),truetruetrue) - $(CXX) $< -o $@ -I$(EVTGEN_INCLUDE) $(CXX_COMMON)\ - -DEVTGEN_PYTHIA -DEVTGEN_EXTERNAL -Wl,-rpath,$(HEPMC2_LIB)\ -@@ -108,7 +108,7 @@ - endif - - # FASTJET3. --main71 main72 main75: $$@.cc $(PREFIX_LIB)/libpythia8.a -+main71 main72 main75: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - ifeq ($(FASTJET3_USE),true) - $(CXX) $< -o $@ -I$(FASTJET3_INCLUDE) $(CXX_COMMON)\ - -L$(FASTJET3_LIB) -Wl,-rpath,$(FASTJET3_LIB) -lfastjet\ -@@ -118,7 +118,7 @@ - endif - - # FASTJET3 with modified Mass-Drop Tagger. --main74: $$@.cc $(PREFIX_LIB)/libpythia8.a -+main74: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - ifeq ($(FASTJET3_USE),true) - $(CXX) $< -o $@ -I$(FASTJET3_INCLUDE) $(CXX_COMMON)\ - -L$(FASTJET3_LIB) -Wl,-rpath,$(FASTJET3_LIB) -lfastjet -lRecursiveTools\ -@@ -128,7 +128,7 @@ - endif - - # FASTJET3 and HEPMC2. --main81 main82 main83 main84: $$@.cc $(PREFIX_LIB)/libpythia8.a -+main81 main82 main83 main84: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - ifeq ($(FASTJET3_USE)$(HEPMC2_USE),truetrue) - $(CXX) $< -o $@ -I$(FASTJET3_INCLUDE) -I$(HEPMC2_INCLUDE) $(CXX_COMMON)\ - -L$(HEPMC2_LIB) -Wl,-rpath,$(HEPMC2_LIB) -lHepMC\ -@@ -139,7 +139,7 @@ - endif - - # ROOT (turn off all warnings for readability). --main91: $$@.cc $(PREFIX_LIB)/libpythia8.a -+main91: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - ifeq ($(ROOT_USE),true) - $(CXX) $< -o $@ -w -I$(ROOT_INCLUDE) $(CXX_COMMON)\ - `$(ROOTBIN)root-config --cflags`\ -@@ -147,7 +147,7 @@ - else - @echo "Error: $@ requires ROOT" - endif --main92: $$@.cc $(PREFIX_LIB)/libpythia8.a main92.so -+main92: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) main92.so - ifeq ($(ROOT_USE),true) - $(CXX) $< main92.so -o $@ -w -I$(ROOT_INCLUDE) $(CXX_COMMON)\ - `$(ROOTBIN)root-config --cflags` -Wl,-rpath,./\ -@@ -155,7 +155,7 @@ - else - @echo "Error: $@ requires ROOT" - endif --main92.so: main92Dct.cc $(PREFIX_LIB)/libpythia8.a -+main92.so: main92Dct.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - $(CXX) $< -o $@ -w -I$(ROOT_INCLUDE) $(CXX_SHARED) $(CXX_COMMON)\ - `$(ROOTBIN)root-config --cflags` - main92Dct.cc: main92.h main92LinkDef.h -@@ -164,7 +164,7 @@ - - # main93 with several dependencies. It is assumed that - # Rivet and YODA are installed to system path or appended to it. --main93: $$@.cc $(PREFIX_LIB)/libpythia8.a main93.so -+main93: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) main93.so - ifeq ($(ROOT_USE),true) - $(CXX) $< main93.so -o $@ -DUSE_ROOT -DUSE_YODA -std=c++11 -w -I$(ROOT_INCLUDE) $(CXX_COMMON)\ - `$(ROOTBIN)root-config --cflags` -Wl,-rpath,./\ -@@ -174,7 +174,7 @@ - $(CXX) $< -o $@ -DUSE_YODA -std=c++11 -w $(CXX_COMMON) -lYODA\ - -lHepMC -lRivet $(GZIP_INC) $(GZIP_FLAGS) - endif --main93.so: main93Dct.cc $(PREFIX_LIB)/libpythia8.a -+main93.so: main93Dct.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - ifeq ($(ROOT_USE),true) - $(CXX) $< -o $@ -w -I$(ROOT_INCLUDE) $(CXX_SHARED) $(CXX_COMMON)\ - `$(ROOTBIN)root-config --cflags` -@@ -190,11 +190,11 @@ - endif - - # User-written examples for tutorials, without external dependencies. --mymain% : mymain%.cc $(PREFIX_LIB)/libpythia8.a -+mymain% : mymain%.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - $(CXX) $< -o $@ $(CXX_COMMON) $(GZIP_INC) $(GZIP_FLAGS) - - # Internally used tests, without external dependencies. --test% : test%.cc $(PREFIX_LIB)/libpythia8.a -+test% : test%.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) - $(CXX) $< -o $@ $(CXX_COMMON) $(GZIP_INC) $(GZIP_FLAGS) - - # Clean. Copied: pythia8/repos/community-x86_64/respect_lib_suffix.patch (from rev 437461, pythia8/trunk/respect_lib_suffix.patch) =================================================================== --- respect_lib_suffix.patch (rev 0) +++ respect_lib_suffix.patch 2019-03-03 14:01:33 UTC (rev 437462) @@ -0,0 +1,141 @@ +diff -aur pythia8235-old/examples/Makefile pythia8235-new/examples/Makefile +--- pythia8235-new/examples/Makefile 2018-03-27 19:15:17.000000000 +0200 ++++ pythia8235-new/examples/Makefile 2018-04-16 13:45:00.155056245 +0200 +@@ -54,20 +54,20 @@ + in the top PYTHIA directory) + + # PYTHIA libraries. +-$(PREFIX_LIB)/libpythia8.a : ++$(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) : + $(error Error: PYTHIA must be built, please run "make"\ + in the top PYTHIA directory) + + # Examples without external dependencies. +-main% : main%.cc $(PREFIX_LIB)/libpythia8.a ++main% : main%.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + $(CXX) $< -o $@ $(CXX_COMMON) $(GZIP_INC) $(GZIP_FLAGS) + + # MixMax. +-main23: $$@.cc $(PREFIX_LIB)/libpythia8.a ++main23: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + $(CXX) $< -o $@ -std=c++11 -w $(CXX_COMMON) $(GZIP_INC) $(GZIP_FLAGS) + + # GZIP (required). +-main34: $$@.cc $(PREFIX_LIB)/libpythia8.a ++main34: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + ifeq ($(GZIP_USE),true) + $(CXX) $< -o $@ $(CXX_COMMON) $(GZIP_INC) $(GZIP_FLAGS) + else +@@ -76,7 +76,7 @@ + + # HEPMC2. + main41 main42 main43 main85 main86 main87 main88 main89: $$@.cc\ +- $(PREFIX_LIB)/libpythia8.a ++ $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + ifeq ($(HEPMC2_USE),true) + $(CXX) $< -o $@ -I$(HEPMC2_INCLUDE) $(CXX_COMMON)\ + -L$(HEPMC2_LIB) -Wl,-rpath,$(HEPMC2_LIB) -lHepMC\ +@@ -86,7 +86,7 @@ + endif + + # PROMC. +-main46: $$@.cc $(PREFIX_LIB)/libpythia8.a ++main46: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + ifeq ($(PROMC_USE),true) + $(CXX) $< -o $@ -I$(PROMC_INCLUDE)/src -I$(PROMC_INCLUDE)/include\ + $(CXX_COMMON) -DPROMC=\"$(PROMC_INCLUDE)\" -Wno-long-long\ +@@ -97,7 +97,7 @@ + endif + + # EVTGEN (and HEPMC2). +-main48: $$@.cc $(PREFIX_LIB)/libpythia8.a ++main48: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + ifeq ($(EVTGEN_USE)$(HEPMC2_USE)$(ENABLE_SHARED),truetruetrue) + $(CXX) $< -o $@ -I$(EVTGEN_INCLUDE) $(CXX_COMMON)\ + -DEVTGEN_PYTHIA -DEVTGEN_EXTERNAL -Wl,-rpath,$(HEPMC2_LIB)\ +@@ -108,7 +108,7 @@ + endif + + # FASTJET3. +-main71 main72 main75: $$@.cc $(PREFIX_LIB)/libpythia8.a ++main71 main72 main75: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + ifeq ($(FASTJET3_USE),true) + $(CXX) $< -o $@ -I$(FASTJET3_INCLUDE) $(CXX_COMMON)\ + -L$(FASTJET3_LIB) -Wl,-rpath,$(FASTJET3_LIB) -lfastjet\ +@@ -118,7 +118,7 @@ + endif + + # FASTJET3 with modified Mass-Drop Tagger. +-main74: $$@.cc $(PREFIX_LIB)/libpythia8.a ++main74: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + ifeq ($(FASTJET3_USE),true) + $(CXX) $< -o $@ -I$(FASTJET3_INCLUDE) $(CXX_COMMON)\ + -L$(FASTJET3_LIB) -Wl,-rpath,$(FASTJET3_LIB) -lfastjet -lRecursiveTools\ +@@ -128,7 +128,7 @@ + endif + + # FASTJET3 and HEPMC2. +-main81 main82 main83 main84: $$@.cc $(PREFIX_LIB)/libpythia8.a ++main81 main82 main83 main84: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + ifeq ($(FASTJET3_USE)$(HEPMC2_USE),truetrue) + $(CXX) $< -o $@ -I$(FASTJET3_INCLUDE) -I$(HEPMC2_INCLUDE) $(CXX_COMMON)\ + -L$(HEPMC2_LIB) -Wl,-rpath,$(HEPMC2_LIB) -lHepMC\ +@@ -139,7 +139,7 @@ + endif + + # ROOT (turn off all warnings for readability). +-main91: $$@.cc $(PREFIX_LIB)/libpythia8.a ++main91: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + ifeq ($(ROOT_USE),true) + $(CXX) $< -o $@ -w -I$(ROOT_INCLUDE) $(CXX_COMMON)\ + `$(ROOTBIN)root-config --cflags`\ +@@ -147,7 +147,7 @@ + else + @echo "Error: $@ requires ROOT" + endif +-main92: $$@.cc $(PREFIX_LIB)/libpythia8.a main92.so ++main92: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) main92.so + ifeq ($(ROOT_USE),true) + $(CXX) $< main92.so -o $@ -w -I$(ROOT_INCLUDE) $(CXX_COMMON)\ + `$(ROOTBIN)root-config --cflags` -Wl,-rpath,./\ +@@ -155,7 +155,7 @@ + else + @echo "Error: $@ requires ROOT" + endif +-main92.so: main92Dct.cc $(PREFIX_LIB)/libpythia8.a ++main92.so: main92Dct.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + $(CXX) $< -o $@ -w -I$(ROOT_INCLUDE) $(CXX_SHARED) $(CXX_COMMON)\ + `$(ROOTBIN)root-config --cflags` + main92Dct.cc: main92.h main92LinkDef.h +@@ -164,7 +164,7 @@ + + # main93 with several dependencies. It is assumed that + # Rivet and YODA are installed to system path or appended to it. +-main93: $$@.cc $(PREFIX_LIB)/libpythia8.a main93.so ++main93: $$@.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) main93.so + ifeq ($(ROOT_USE),true) + $(CXX) $< main93.so -o $@ -DUSE_ROOT -DUSE_YODA -std=c++11 -w -I$(ROOT_INCLUDE) $(CXX_COMMON)\ + `$(ROOTBIN)root-config --cflags` -Wl,-rpath,./\ +@@ -174,7 +174,7 @@ + $(CXX) $< -o $@ -DUSE_YODA -std=c++11 -w $(CXX_COMMON) -lYODA\ + -lHepMC -lRivet $(GZIP_INC) $(GZIP_FLAGS) + endif +-main93.so: main93Dct.cc $(PREFIX_LIB)/libpythia8.a ++main93.so: main93Dct.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + ifeq ($(ROOT_USE),true) + $(CXX) $< -o $@ -w -I$(ROOT_INCLUDE) $(CXX_SHARED) $(CXX_COMMON)\ + `$(ROOTBIN)root-config --cflags` +@@ -190,11 +190,11 @@ + endif + + # User-written examples for tutorials, without external dependencies. +-mymain% : mymain%.cc $(PREFIX_LIB)/libpythia8.a ++mymain% : mymain%.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + $(CXX) $< -o $@ $(CXX_COMMON) $(GZIP_INC) $(GZIP_FLAGS) + + # Internally used tests, without external dependencies. +-test% : test%.cc $(PREFIX_LIB)/libpythia8.a ++test% : test%.cc $(PREFIX_LIB)/libpythia8$(LIB_SUFFIX) + $(CXX) $< -o $@ $(CXX_COMMON) $(GZIP_INC) $(GZIP_FLAGS) + + # Clean.