[arch-commits] Commit in pythia8/trunk (5 files)

Konstantin Gizdov kgizdov at archlinux.org
Tue Jan 7 21:32:51 UTC 2020


    Date: Tuesday, January 7, 2020 @ 21:32:50
  Author: kgizdov
Revision: 550101

upgpkg: pythia8 8.2.44-1

Added:
  pythia8/trunk/fix_lhapdf_build.patch
  pythia8/trunk/respect_lib_suffix.patch
Modified:
  pythia8/trunk/PKGBUILD
Deleted:
  pythia8/trunk/fix_ar_options.patch
  pythia8/trunk/fix_python_lib_paths.patch

----------------------------+
 PKGBUILD                   |   49 ++++++++------
 fix_ar_options.patch       |   17 -----
 fix_lhapdf_build.patch     |   12 +++
 fix_python_lib_paths.patch |   18 -----
 respect_lib_suffix.patch   |  141 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 182 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-07 21:29:45 UTC (rev 550100)
+++ PKGBUILD	2020-01-07 21:32:50 UTC (rev 550101)
@@ -4,7 +4,7 @@
 
 pkgbase=pythia8
 pkgname=('pythia8' 'python-pythia8')
-pkgver=8.3.01
+pkgver=8.2.44
 _pkgid="${pkgbase:0:-1}${pkgver//./}"
 pkgrel=1
 pkgdesc="High-energy physics events generator"
@@ -11,16 +11,16 @@
 arch=('x86_64')
 url="http://home.thep.lu.se/Pythia/"
 license=('GPL')
-depends=('python' 'openmp')
+depends=('python')
 makedepends=('fastjet' 'hepmc' 'lhapdf>=6.2' 'root')
 source=("http://home.thep.lu.se/~torbjorn/pythia8/${_pkgid}.tgz"
         'pythia8.sh'
-        'fix_ar_options.patch'
-        'fix_python_lib_paths.patch')
-sha256sums=('51382768eb9aafb97870dca1909516422297b64ef6a6b94659259b3e4afa7f06'
+        'fix_lhapdf_build.patch'
+        'respect_lib_suffix.patch')
+sha256sums=('e34880f999daf19cdd893a187123927ba77d1bf851e30f6ea9ec89591f4c92ca'
             '4e373b685960e410024b4e33e22c2dea360dfedd7962837087332f428c974ae5'
-            '27b8a11d404be6cb683ec7fc5a2b3cca7f443bde751be2771d68f060a380c212'
-            '50958ce04faf57da452af64ec3f1fd3ba961a3b27e0e22fee24ea046f461186b')
+            'f7c70b069b350005ac7e9028617713dece9b82c1e8b0dc5fb1f2870abec1d94c'
+            '4eb15725cfb5e287fdd9520cb4211b88ebc38a690b7522690ba0664d50bc8669')
 get_pyver () {
     python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
 }
@@ -27,8 +27,9 @@
 
 prepare() {
     cd "${srcdir}/${_pkgid}"
-    patch -p1 -i "${srcdir}/fix_ar_options.patch"
-    patch -p1 -i "${srcdir}/fix_python_lib_paths.patch"
+
+    patch -p1 -i "${srcdir}/respect_lib_suffix.patch"
+    patch -p1 -i "${srcdir}/fix_lhapdf_build.patch"
 }
 
 build() {
@@ -39,11 +40,20 @@
     cd "${srcdir}/${_pkgid}"
     # # no such package yet
     # --with-evtgen \
+    # --with-evtgen-include=${_inc} \
+    # --with-evtgen-lib=${_lib} \
+    # # no such package yet
     # --with-hepmc3 \
-    # --with-mg5mes \
+    # --with-hepmc3-include=${_inc} \
+    # --with-hepmc3-lib=${_lib} \
+    # # no such package yet
     # --with-powheg \
-    # --with-rivet \
-    # --with-yoda \
+    # --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} \
@@ -51,6 +61,7 @@
         --prefix-share=${_share} \
         --cxx-common="${CXXFLAGS} -fPIC" \
         --cxx-shared="-shared ${LDFLAGS} -ldl" \
+        --enable-shared \
         --with-fastjet3 \
         --with-fastjet3-include=${_inc} \
         --with-fastjet3-lib=${_lib} \
@@ -66,9 +77,6 @@
         --with-lhapdf6 \
         --with-lhapdf6-include=${_inc} \
         --with-lhapdf6-lib=${_lib} \
-        --with-openmp \
-        --with-openmp-include=${_inc} \
-        --with-openmp-lib=${_lib} \
         --with-python \
         --with-python-include="/usr/include/python$(get_pyver)" \
         --with-python-lib="/usr/lib/python$(get_pyver)" \
@@ -79,9 +87,6 @@
 }
 
 package_pythia8() {
-    provides=('pythia')
-    conflicts=('pythia')
-    replaces=('pythia')
     optdepends=('fastjet: fast jet finding in pp and e+e- collisions'
                 'hepmc: storing collisions from Monte Carlo'
                 'lhapdf: evaluate PDFs from discretised data files'
@@ -88,6 +93,7 @@
                 '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"
@@ -104,8 +110,11 @@
 
 package_python-pythia8() {
     pkgdesc="Python bindings for Pythia"
-    depends=('pythia8')
+    depends=('pythia')
 
     cd "${srcdir}/${_pkgid}"
-    install -Dm755 lib/pythia8.so "${pkgdir}/usr/lib/python$(get_pyver)/site-packages/pythia8.so"
+
+    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-*.pyc  -t "${pkgdir}/usr/lib/python$(get_pyver)/site-packages/__pycache__/"
 }

Deleted: fix_ar_options.patch
===================================================================
--- fix_ar_options.patch	2020-01-07 21:29:45 UTC (rev 550100)
+++ fix_ar_options.patch	2020-01-07 21:32:50 UTC (rev 550101)
@@ -1,17 +0,0 @@
---- pythia8301-old/Makefile	2019-11-18 16:03:32.498781658 +0200
-+++ pythia8301-new/Makefile	2019-11-18 15:57:35.342991437 +0200
-@@ -106,13 +106,13 @@
- # PYTHIA.
- $(LOCAL_TMP)/Pythia.o: $(LOCAL_SRC)/Pythia.cc Makefile.inc
- 	$(CXX) $< -o $@ -c $(OBJ_COMMON) -DXMLDIR=\"$(PREFIX_SHARE)/xmldoc\"
- $(LOCAL_TMP)/%.o: $(LOCAL_SRC)/%.cc Makefile.inc
- 	$(CXX) $< -o $@ -c $(OBJ_COMMON)
- $(LOCAL_LIB)/libpythia8.a: $(OBJECTS) $(OBJECTS_ME)
--	ar cr $@ $^
-+	ar rcs $@ $^
- $(LOCAL_LIB)/libpythia8$(LIB_SUFFIX): $(OBJECTS) $(OBJECTS_ME)
- 	$(CXX) $^ -o $@ $(CXX_COMMON) $(CXX_SHARED) $(CXX_SONAME)$(notdir $@)\
- 	  $(LIB_COMMON)
- 
- # LHAPDF (turn off all warnings for readability).
- $(LOCAL_TMP)/LHAPDF%Plugin.o: $(LOCAL_INCLUDE)/Pythia8Plugins/LHAPDF%.h

Added: fix_lhapdf_build.patch
===================================================================
--- fix_lhapdf_build.patch	                        (rev 0)
+++ fix_lhapdf_build.patch	2020-01-07 21:32:50 UTC (rev 550101)
@@ -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: fix_python_lib_paths.patch
===================================================================
--- fix_python_lib_paths.patch	2020-01-07 21:29:45 UTC (rev 550100)
+++ fix_python_lib_paths.patch	2020-01-07 21:32:50 UTC (rev 550101)
@@ -1,18 +0,0 @@
-diff -au6r pythia8301-old/plugins/python/Makefile pythia8301-new/plugins/python/Makefile
---- pythia8301-old/plugins/python/Makefile	2019-10-29 18:08:54.000000000 +0200
-+++ pythia8301-new/plugins/python/Makefile	2019-11-18 17:08:21.959441069 +0200
-@@ -24,13 +24,13 @@
- TOP_INCLUDE=../../include
- LOCAL_SRC=src
- LOCAL_TMP=tmp
- 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)
- 
- # Determine the headers.
- HEADERS=$(patsubst ../../include/Pythia8%.h,$(LOCAL_INCLUDE)/Pythia8%.h,\
- 	$(sort $(wildcard ../../include/Pythia8*/*.h)))
- 

Added: respect_lib_suffix.patch
===================================================================
--- respect_lib_suffix.patch	                        (rev 0)
+++ respect_lib_suffix.patch	2020-01-07 21:32:50 UTC (rev 550101)
@@ -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.



More information about the arch-commits mailing list