Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=339f75f6c543d650d8c1dd1c5b32ecfeeb73f817
commit 339f75f6c543d650d8c1dd1c5b32ecfeeb73f817 Author: crazy <[email protected]> Date: Sun Feb 21 13:25:04 2016 +0100 efivar-0.22-1-x86_64 * Version bump diff --git a/source/base/efivar/FrugalBuild b/source/base/efivar/FrugalBuild index 4d76230..f2eb8f7 100644 --- a/source/base/efivar/FrugalBuild +++ b/source/base/efivar/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy <[email protected]> pkgname=efivar -pkgver=0.21 -pkgrel=2 +pkgver=0.22 +pkgrel=1 pkgdesc="Library to manipulate EFI variables" url="https://github.com/vathpela/$pkgname"; depends=('popt>=1.16-4') @@ -12,13 +12,17 @@ archs=('!i686' 'x86_64') _F_github_author="vathpela" _F_github_tag=" " Finclude github -sha1sums=('b9f0874c4de340bc065d09ff08978ad0d05a6989') +source=($source nvme_ioctl.h.patch do-not-create-circular-depends.patch) +sha1sums=('5b8723c5a08bfaff33c77bd53a78696099f4d4d2' \ + 'eb3ac05788e90e89793b599d0f0101c816530d8f' \ + 'e760be3d71eb6d33e0d900e69a73f1a7ef3e7d4f') build() { Fcd $pkgname-devel-$pkgver Fsed "lib64" "lib" Make.defaults export OPT_FLAGS="$CFLAGS" + _F_make_opts="-j1" Fbuild } diff --git a/source/base/efivar/do-not-create-circular-depends.patch b/source/base/efivar/do-not-create-circular-depends.patch new file mode 100644 index 0000000..1d3c817 --- /dev/null +++ b/source/base/efivar/do-not-create-circular-depends.patch @@ -0,0 +1,11 @@ +diff -Naur efivar-devel-0.22/Make.defaults efivar-devel-0.22-fix/Make.defaults +--- efivar-devel-0.22/Make.defaults 2016-01-20 19:29:21.000000000 +0100 ++++ efivar-devel-0.22-fix/Make.defaults 2016-02-21 13:19:22.987211845 +0100 +@@ -25,6 +25,7 @@ + clang_cflags = + gcc_cflags = -specs=$(TOPDIR)/gcc.specs + cflags = $(CFLAGS) -I${TOPDIR}/src/include/efivar/ \ ++ -L${TOPDIR}/src/ \ + $(if $(filter $(CC),clang),$(clang_cflags),) \ + $(if $(filter $(CC),gcc),$(gcc_cflags),) \ + $(call pkg-config-cflags) diff --git a/source/base/efivar/nvme_ioctl.h.patch b/source/base/efivar/nvme_ioctl.h.patch new file mode 100644 index 0000000..221ec5a --- /dev/null +++ b/source/base/efivar/nvme_ioctl.h.patch @@ -0,0 +1,30 @@ +From ae0869b71a90bc14e67f3c917bd9c96db25c99a6 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <[email protected]> +Date: Thu, 14 Jan 2016 17:02:31 -0500 +Subject: [PATCH] Workaround rename of linux/nvme.h + +Bug: https://bugs.gentoo.org/571548 +--- + src/linux.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/linux.c b/src/linux.c +index 5ebc151..e551377 100644 +--- a/src/linux.c ++++ b/src/linux.c +@@ -22,7 +22,12 @@ + #include <inttypes.h> + #include <limits.h> + #include <linux/ethtool.h> ++#include <linux/version.h> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) ++#include <linux/nvme_ioctl.h> ++#else + #include <linux/nvme.h> ++#endif + #include <linux/sockios.h> + #include <net/if.h> + #include <scsi/scsi.h> +-- +2.7.0 + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
