Jakub Klinkovský pushed to branch main at Arch Linux / Packaging / Packages /
adios2
Commits:
2d8d9cc8 by Jakub Klinkovský at 2024-11-17T09:18:36+01:00
update license to SPDX
- - - - -
d08fbd0e by Jakub Klinkovský at 2024-11-17T10:51:21+01:00
upgpkg: 2.10.2-1
- new upstream release
- refactor cmake options
- add patch to fix installation of adios2-config
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + fix-destdir-installation.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,10 +1,10 @@
pkgbase = adios2
pkgdesc = The Adaptable Input/Output System version 2
- pkgver = 2.10.1
- pkgrel = 3
+ pkgver = 2.10.2
+ pkgrel = 1
url = https://adios2.readthedocs.io/en/latest/
arch = x86_64
- license = Apache
+ license = Apache-2.0
makedepends = cmake
makedepends = gcc-fortran
makedepends = gtest
@@ -27,7 +27,9 @@ pkgbase = adios2
depends = zeromq
depends = zfp
depends = zlib
- source =
https://github.com/ornladios/ADIOS2/archive/v2.10.1/adios2-2.10.1.tar.gz
- sha256sums =
ce776f3a451994f4979c6bd6d946917a749290a37b7433c0254759b02695ad85
+ source =
https://github.com/ornladios/ADIOS2/archive/v2.10.2/adios2-2.10.2.tar.gz
+ source = fix-destdir-installation.patch
+ sha256sums =
14cf0bcd94772194bce0f2c0e74dba187965d1cffd12d45f801c32929158579e
+ sha256sums =
601dccc582f957b19bbe5e980ed37fcaeec85b66f63fbb357735345ac0a16d60
pkgname = adios2
=====================================
PKGBUILD
=====================================
@@ -1,31 +1,42 @@
# Maintainer: Bruno Pagani <[email protected]>
+# Maintainer: Jakub Klinkovský <lahwaacz at archlinux dot org>
pkgname=adios2
-pkgver=2.10.1
-pkgrel=3
+pkgver=2.10.2
+pkgrel=1
pkgdesc="The Adaptable Input/Output System version 2"
arch=(x86_64)
url="https://adios2.readthedocs.io/en/latest/";
-license=(Apache)
+license=(Apache-2.0)
depends=(blosc bzip2 glibc gcc-libs hdf5 libfabric libpng nlohmann-json
openmpi pugixml pybind11 sz yaml-cpp zeromq zfp zlib)
# with mgard does not build currently, not time to investigate
makedepends=(cmake gcc-fortran gtest python python-mpi4py python-numpy)
-source=(https://github.com/ornladios/ADIOS2/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('ce776f3a451994f4979c6bd6d946917a749290a37b7433c0254759b02695ad85')
+source=(https://github.com/ornladios/ADIOS2/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
+ fix-destdir-installation.patch)
+sha256sums=('14cf0bcd94772194bce0f2c0e74dba187965d1cffd12d45f801c32929158579e'
+ '601dccc582f957b19bbe5e980ed37fcaeec85b66f63fbb357735345ac0a16d60')
+
+prepare() {
+ # Fix DESTDIR installation https://github.com/ornladios/ADIOS2/pull/4402
+ patch --directory=${pkgname^^}-${pkgver} -Np1 <
fix-destdir-installation.patch
+}
build() {
- cmake -B build -S ${pkgname^^}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DADIOS2_USE_EXTERNAL_DEPENDENCIES=ON \
- -DADIOS2_HAVE_HDF5_VOL=OFF \
- -DADIOS2_BUILD_EXAMPLES=OFF #\
- #-DMGARD_INCLUDE_DIR=/usr/include/mgard
+ local cmake_flags=(
+ -B build -S ${pkgname^^}-${pkgver}
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DADIOS2_USE_EXTERNAL_DEPENDENCIES=ON
#-DADIOS2_HAVE_HDF5_VOL needs hdf5-openmpi
- make VERBOSE=1 -C build
+ -DADIOS2_HAVE_HDF5_VOL=OFF
+ -DADIOS2_BUILD_EXAMPLES=OFF
+ #-DMGARD_INCLUDE_DIR=/usr/include/mgard
+ )
+ cmake "${cmake_flags[@]}"
+ cmake --build build
}
package() {
CMAKE_PREFIX_PATH="$pkgdir"/usr/lib/cmake \
- make -C build DESTDIR="${pkgdir}" install
+ DESTDIR="$pkgdir" cmake --install build
}
=====================================
fix-destdir-installation.patch
=====================================
@@ -0,0 +1,15 @@
+diff --git a/cmake/install/post/generate-adios2-config.sh.in
b/cmake/install/post/generate-adios2-config.sh.in
+index 1c5139367..a789810da 100755
+--- a/cmake/install/post/generate-adios2-config.sh.in
++++ b/cmake/install/post/generate-adios2-config.sh.in
+@@ -65,8 +65,8 @@ then
+ # Convert relative paths to absolute based on DESTDIR
+ PREFIX="${DESTDIR:-$(pwd)}/$1"
+ else
+- # check if the PREFIX directory exists and prepend DESTDIR if not
+- if [ ! -d "${PREFIX}" ]
++ # Check if the DESTDIR directory exists and prepend it to PREFIX
++ if [ -d "${DESTDIR}" ]
+ then
+ PREFIX="${DESTDIR}$1"
+ fi
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/adios2/-/compare/67b9c7ad11345503ee777900c0fc3d3f9c271770...d08fbd0eca1d4fedfbfd115474768cfde1ce9466
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/adios2/-/compare/67b9c7ad11345503ee777900c0fc3d3f9c271770...d08fbd0eca1d4fedfbfd115474768cfde1ce9466
You're receiving this email because of your account on gitlab.archlinux.org.
