diff options
| -rw-r--r-- | testing/nvme-cli/APKBUILD | 35 | ||||
| -rw-r--r-- | testing/nvme-cli/musl-fix.patch | 29 | ||||
| -rw-r--r-- | unmaintained/nvme-cli/APKBUILD | 35 |
3 files changed, 64 insertions, 35 deletions
diff --git a/testing/nvme-cli/APKBUILD b/testing/nvme-cli/APKBUILD new file mode 100644 index 0000000000..42b97169d3 --- /dev/null +++ b/testing/nvme-cli/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Florian Heigl <florian.heigl@gmail.com> +# Maintainer: Florian Heigl <florian.heigl@gmail.com> +pkgname=nvme-cli +pkgver=1.1 +pkgrel=0 +pkgdesc="NVM-Express user space tooling for Linux" +arch="all" +url="https://github.com/linux-nvme/nvme-cli" +license="GPL" +depends="" +makedepends="$depends_dev linux-headers" +provides="nvme-cli" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/linux-nvme/nvme-cli/archive/v${pkgver}.tar.gz + musl-fix.patch + " + +builddir="$srcdir"/$pkgname-$pkgver + +build() { + cd "$builddir" + make PREFIX="/usr" || return 1 +} + +package() { + cd "$builddir" + make PREFIX="/usr" DESTDIR="$pkgdir" install +} + +md5sums="450b5c381c83df8f117824e7d0fe0076 nvme-cli-1.1.tar.gz +f8e92a9d93b8cde78b82ad40f89f2c19 musl-fix.patch" +sha256sums="22883719cbab86d52e8d4755e86ebd70476416e87442385a79b31c981bd60de1 nvme-cli-1.1.tar.gz +79328b8836c27c661f12fd8a719bf27559c4824c2dd9a10dcf698e1373a007de musl-fix.patch" +sha512sums="339da4385c5e8659a8f3c2e11afadf437d9cdf02c294674e5cc569cd817174c8ccbd4fc8858ce6f5b8f63ccba68790b2140fc87fdf33b7d394b67999ac4afad0 nvme-cli-1.1.tar.gz +01cea64b9593b4aac5c13a18538a561b5d538437232dc67f17d955c1661d42cf62671924277449f9611e0fb543cddc7e4ba89e34ff764eb86929201f1e336faa musl-fix.patch" diff --git a/testing/nvme-cli/musl-fix.patch b/testing/nvme-cli/musl-fix.patch new file mode 100644 index 0000000000..873233bfc8 --- /dev/null +++ b/testing/nvme-cli/musl-fix.patch @@ -0,0 +1,29 @@ +From 329df07e86c27308a3c3fee9054390bc0271e8b8 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon, 26 Dec 2016 23:12:58 +0100 +Subject: [PATCH] Include endian.h for byte/host order functions + +Fix the following error when building with musl libc: + +nvme.h:136:2: error: implicit declaration of function 'le16toh' +[-Werror=implicit-function-declaration] + le16toh((__force __u16)(x)) + ^ + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +--- + nvme.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/nvme.h b/nvme.h +index 6623505..5481916 100644 +--- a/nvme.h ++++ b/nvme.h +@@ -16,6 +16,7 @@ + #define _NVME_H + + #include <stdbool.h> ++#include <endian.h> + #include "plugin.h" + + #define unlikely(x) x diff --git a/unmaintained/nvme-cli/APKBUILD b/unmaintained/nvme-cli/APKBUILD deleted file mode 100644 index 760b69c871..0000000000 --- a/unmaintained/nvme-cli/APKBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Contributor: Florian Heigl <florian.heigl@gmail.com> -# Maintainer: Florian Heigl <florian.heigl@gmail.com> -pkgname=nvme-cli -pkgver=0.3 -pkgrel=1 -pkgdesc="NVM-Express user space tooling for Linux" -arch="all" -url="https://github.com/linux-nvme/nvme-cli" -license="GPL" -depends="" -makedepends="$depends_dev linux-headers" -provides="nvme-cli" -subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/linux-nvme/nvme-cli/archive/v${pkgver}.tar.gz" - -_builddir="$srcdir"/$pkgname-$pkgver - -# no patches just yet -prepare() { - cd "$_builddir" -} - -build() { - cd "$_builddir" - make PREFIX="/usr" || return 1 -} - -package() { - cd "$_builddir" - make PREFIX="/usr" DESTDIR="$pkgdir" install -} - -md5sums="397445255b73a1159d3000974d38a098 nvme-cli-0.3.tar.gz" -sha256sums="c631e90dd4d411cdb618b26bc36b06706e6f1f2d3db38874bcfe48f4bc15aac4 nvme-cli-0.3.tar.gz" -sha512sums="91e85eb487991da24cb254abf0047004ab21bcc2be18a569a86476eac80ac7e0a677daebb1c157b5bc00a3518df728d65f66da0b20e240e1fd786b655a791045 nvme-cli-0.3.tar.gz" |