diff options
author | Anton Kudelin | 2024-04-29 21:28:55 +0300 |
---|---|---|
committer | Anton Kudelin | 2024-04-29 21:28:55 +0300 |
commit | 1e6f93ef0a4b7ea4afa1b7c662cf0a7672d22e90 (patch) | |
tree | a87c76ce02a852721bf278be0a9dc5cd9428a408 | |
parent | 838a10c9c983f36f00cee37af01550f1af71bceb (diff) | |
download | aur-vmd-src.tar.gz |
python3.12 rebuild
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 30 | ||||
-rw-r--r-- | configure.patch | 14 |
3 files changed, 36 insertions, 12 deletions
@@ -1,7 +1,7 @@ pkgbase = vmd-src pkgdesc = Visual Molecular Dynamics pkgver = 1.9.4a57 - pkgrel = 3 + pkgrel = 4 url = http://www.ks.uiuc.edu/Research/vmd/ arch = x86_64 arch = aarch64 @@ -26,6 +26,6 @@ pkgbase = vmd-src source = local://vmd-1.9.4a57.src.tar.gz source = configure.patch sha256sums = de278d0c5d969336d89068e0806fb50aaa0cb0f546ba985d840b279357860679 - sha256sums = 93ef1e106141e7386113dcc64185174413e30934fba597ce2ebe44660c2d7665 + sha256sums = a74a8bbee40667742907b59aa24bdb37607761389a9c332c2d449ef07a2f0937 pkgname = vmd-src @@ -6,7 +6,7 @@ pkgname=vmd-src _pkgname=vmd pkgver=1.9.4a57 -pkgrel=3 +pkgrel=4 pkgdesc="Visual Molecular Dynamics" url="http://www.ks.uiuc.edu/Research/vmd/" license=(custom) @@ -25,7 +25,7 @@ conflicts=($_pkgname $_pkgname-bin) source=(local://$_pkgname-${pkgver}.src.tar.gz configure.patch) sha256sums=('de278d0c5d969336d89068e0806fb50aaa0cb0f546ba985d840b279357860679' - '93ef1e106141e7386113dcc64185174413e30934fba597ce2ebe44660c2d7665') + 'a74a8bbee40667742907b59aa24bdb37607761389a9c332c2d449ef07a2f0937') prepare() { sed -i 's/ltcl8.5/ltcl/g' plugins/Make-arch @@ -65,8 +65,32 @@ build() { cd "$srcdir/plugins" make -j1 $MACHINE make distrib + cd ../$_pkgname-$pkgver - ./configure $MACHINE $ACC $RAY OPENGL EGLPBUFFER FLTKOPENGL FLTK TK IMD OPENCL MPI XINERAMA XINPUT LIBPNG ZLIB NETCDF COLVARS TCL PYTHON NUMPY PTHREADS GCC + ./configure \ + $MACHINE \ + $ACC \ + $RAY \ + OPENGL \ + EGLPBUFFER \ + FLTKOPENGL \ + FLTK \ + TK \ + IMD \ + OPENCL \ + MPI \ + XINERAMA \ + XINPUT \ + LIBPNG \ + ZLIB \ + NETCDF \ + COLVARS \ + TCL \ + PYTHON \ + NUMPY \ + PTHREADS \ + GCC + cd src make veryclean make diff --git a/configure.patch b/configure.patch index b5c483b644d5..106fc6998ad0 100644 --- a/configure.patch +++ b/configure.patch @@ -86,8 +86,8 @@ -# $mpi_libs = "-lmpi"; +$mpi_dir = "/usr"; +$mpi_include = "-I/usr/include"; -+$mpi_library = "-L$mpi_dir/lib/openmpi"; -+$mpi_libs = "-lmpi_cxx -lmpi"; ++$mpi_library = "-L$mpi_dir/lib"; ++$mpi_libs = "-lmpi"; ## OSU MVAPICH # $mpi_dir = "/usr/mpi/gcc/mvapich-1.0.0"; # $mpi_include = "-I$mpi_dir/include"; @@ -123,16 +123,16 @@ - $stock_numpy_include_dir=$ENV{"NUMPY_INCLUDE_DIR"} || "$vmd_library_dir/numpy/lib_$config_arch/include"; - $stock_numpy_library_dir=$ENV{"NUMPY_LIBRARY_DIR"} || "$vmd_library_dir/python/lib_$config_arch/lib/python2.5/site-packages/numpy/core/include"; - $python_libs = "-lpython2.5 -lpthread"; -+ $stock_python_include_dir=$ENV{"PYTHON_INCLUDE_DIR"} || "/usr/include/python3.11"; -+ $stock_python_library_dir=$ENV{"PYTHON_LIBRARY_DIR"} || "/usr/lib/python3.11/config-3.11-x86_64-linux-gnu"; ++ $stock_python_include_dir=$ENV{"PYTHON_INCLUDE_DIR"} || "/usr/include/python3.12"; ++ $stock_python_library_dir=$ENV{"PYTHON_LIBRARY_DIR"} || "/usr/lib/python3.12/config-3.12-x86_64-linux-gnu"; +# $stock_python_include_dir=$ENV{"PYTHON_INCLUDE_DIR"} || "$vmd_library_dir/python/lib_$config_arch/include/python2.5"; +# $stock_python_library_dir=$ENV{"PYTHON_LIBRARY_DIR"} || "$vmd_library_dir/python/lib_$config_arch/lib/python2.5/config"; + -+ $stock_numpy_include_dir=$ENV{"NUMPY_INCLUDE_DIR"} || "/usr/lib/python3.11/site-packages/numpy/core/include/numpy"; -+ $stock_numpy_library_dir=$ENV{"NUMPY_LIBRARY_DIR"} || "/usr/lib/python3.11/site-packages/numpy/core/include"; ++ $stock_numpy_include_dir=$ENV{"NUMPY_INCLUDE_DIR"} || "/usr/lib/python3.12/site-packages/numpy/core/include/numpy"; ++ $stock_numpy_library_dir=$ENV{"NUMPY_LIBRARY_DIR"} || "/usr/lib/python3.12/site-packages/numpy/core/include"; +# $stock_numpy_include_dir=$ENV{"NUMPY_INCLUDE_DIR"} || "$vmd_library_dir/numpy/lib_$config_arch/include"; +# $stock_numpy_library_dir=$ENV{"NUMPY_LIBRARY_DIR"} || "$vmd_library_dir/python/lib_$config_arch/lib/python2.5/site-packages/numpy/core/include"; -+ $python_libs = "-lpython3.11 -lpthread"; ++ $python_libs = "-lpython3.12 -lpthread"; } $python_defines = "-DVMDPYTHON"; |