summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Ramsden2020-07-21 20:04:48 -0700
committerJohn Ramsden2020-07-21 20:04:48 -0700
commit317cb22d5114a2af141231a2a23ca0080ae2cb3a (patch)
tree987a93a2c14113d1cd8201a415247c6b6a0b36e0
parent17418fd88188391328eb0bd701a09c08d62c2e3d (diff)
downloadaur-317cb22d5114a2af141231a2a23ca0080ae2cb3a.tar.gz
Add patch to remove libspl
-rw-r--r--0001-Remove-libspl-no-longer-needed.patch24
-rw-r--r--PKGBUILD15
2 files changed, 36 insertions, 3 deletions
diff --git a/0001-Remove-libspl-no-longer-needed.patch b/0001-Remove-libspl-no-longer-needed.patch
new file mode 100644
index 000000000000..7d08ec0f4b8f
--- /dev/null
+++ b/0001-Remove-libspl-no-longer-needed.patch
@@ -0,0 +1,24 @@
+From ce57eb995c23f6cd323d8a4ecaa942bc1a304ef5 Mon Sep 17 00:00:00 2001
+From: John Ramsden <johnramsden@riseup.net>
+Date: Tue, 21 Jul 2020 19:52:49 -0700
+Subject: [PATCH] Remove libspl no longer needed
+
+---
+ CMakeModules/FindZFS.cmake | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeModules/FindZFS.cmake b/CMakeModules/FindZFS.cmake
+index 2673e64..33e720a 100644
+--- a/CMakeModules/FindZFS.cmake
++++ b/CMakeModules/FindZFS.cmake
+@@ -38,7 +38,6 @@ find_library(LIBZPOOL_LIB REQUIRED NAMES libzpool zpool)
+ find_library(LIBZFS_CORE_LIB REQUIRED NAMES libzfs_core zfs_core)
+ find_library(LIBNVPAIR_LIB REQUIRED NAMES libnvpair nvpair)
+ find_library(LIBUUTIL_LIB REQUIRED NAMES libuutil uutil)
+-find_library(LIBSPL_LIB REQUIRED NAMES libspl spl)
+
+ if(LIBZFS_LIB)
+ message("libzfs library found at: ${LIBZFS_LIB}")
+--
+2.27.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 0f506ca4c146..8cc2a0783054 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=zectl
pkgver=0.1.1
-pkgrel=3
+pkgrel=4
pkgdesc="ZFS Boot Environment manager."
url="http://github.com/johnramsden/${pkgname}"
arch=('any')
@@ -12,9 +12,18 @@ makedepends=('make' 'cmake')
conflicts=("${pkgname}-git")
provides=("zectl")
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/johnramsden/${pkgname}/archive/v${pkgver}.tar.gz")
+source=(
+ "${pkgname}-${pkgver}.tar.gz::https://github.com/johnramsden/${pkgname}/archive/v${pkgver}.tar.gz"
+ "0001-Remove-libspl-no-longer-needed.patch"
+)
-sha256sums=('3103d955b990c9b67ba1c7b50b4c712a7edea605f37ff167c4f71a6756f13cf8')
+sha256sums=('3103d955b990c9b67ba1c7b50b4c712a7edea605f37ff167c4f71a6756f13cf8'
+ '6d826973996382d893df5958c6aeaed237aed4077b6e12bcbeb97e578d86c3ee')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch --forward --strip=1 --input="${srcdir}/0001-Remove-libspl-no-longer-needed.patch"
+}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"