commit: 0d259ad72bb04c5a9bc1c83d35b1cd327f4240e6
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Nov 21 21:25:37 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Nov 21 21:25:37 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=0d259ad7
sys-libs/efivar: Add 30
Sync with upstream and drop r99 postfix
musl's byteswapping definitions are incompatible with the use in this program,
just copy them from the header.
musl does not define strndupa
sys-libs/efivar/Manifest | 8 +++-
.../{efivar-0.21-r99.ebuild => efivar-0.21.ebuild} | 7 ++-
sys-libs/efivar/efivar-30.ebuild | 50 ++++++++++++++++++++++
sys-libs/efivar/files/0.23-musl.patch | 21 +++++++++
sys-libs/efivar/files/27-strndupa.patch | 19 ++++++++
sys-libs/efivar/metadata.xml | 2 +-
6 files changed, 102 insertions(+), 5 deletions(-)
diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest
index a1abe54..edccd9f 100644
--- a/sys-libs/efivar/Manifest
+++ b/sys-libs/efivar/Manifest
@@ -1,5 +1,9 @@
AUX 0.21-initializer.patch 1261 SHA256
ce6792192c9014bd0db4acbf0866f3d6eb1e608225177cbfaf6dd54b7d447bf5 SHA512
e7593fcefead06007a2314217b4be61161261b2be06c631065ede00f48098b924395605faba2ef859be9b6a242d531942460f2b51ea346d1cb93af94ecb23b3c
WHIRLPOOL
efcec5c85046ba5acff2b8559fad7c05175ed791ea84f47587013e90a3e2c301df507a776097795f0003625fbc40b95d79ecb1a349ee5ee08d5b4a7ad841b452
AUX 0.21-musl.patch 2108 SHA256
319478e8626271f4fa17fdfeabeca84a08027d1228ac02b60169dd1a3d676deb SHA512
fb0df957015f4b34fa89786780b070df2fe9d7511882cc836d643997d83e303863d2016fb780c3a0f047b84e67093584690ab42fb1772165b2742206402e0f3d
WHIRLPOOL
fea636b8b89770d7d43267d5e0bb7c46ef1d76a87120a5facb6e2db20c03c9b3f784317f2c6b6d31bb800e40d33c069056c1e895e154faa67cce87b0ff7ff127
+AUX 0.23-musl.patch 934 SHA256
8979af4cdc8eefd54209e0ae2c8b3e1bb820bba35de2a788d177998a077200e7 SHA512
f5736bff08e86fb388695ef44303da5c322275871028e726d38bfc3822de6c89fa498555a10ae51c55d79c9f55a8595ce6d84d3bff5350207b212ca08cbf1abb
WHIRLPOOL
883b73f26b78b95ee69672d165c1c54beb4e46e1c27b900fcfafebdf39ca134a116ed7f72ad279c99e70b420adae7c2df4f8fc6c94254416c9f73c4b07f77459
+AUX 27-strndupa.patch 702 SHA256
b53715e85e65794967434d6751f19cf9d2139cbdbd02d1dd870873957deb596b SHA512
746083032316440b83de82680ec51fd5ca195a48977f4a4e3384114104620fdfd115cf408f1baa7e3ca5f7d038a968131a078349d5404b55277b3b8ba0a15607
WHIRLPOOL
02ce9d9e266fb5112a2bde917e835c51fd2094a6ad3222e7df83511dd5d350104ecbe755b2eac5e9cbf07961734799a334356da6a4d359ab8bb251b884914d81
DIST efivar-0.21.tar.bz2 66677 SHA256
04b9b9de9d9a1a013395400438a033daf4a4290f497ec5be04a120e2ac535094 SHA512
851b5e29c2dab213bb81c6ea5c5c211d36fb6846de8aa1086b0657f06917c2f93bf154aa3a4c2dda22103bdf1d67ca877f9771dc3f979c9311ca24e0bc09492a
WHIRLPOOL
d6cdb2e2f047a22677d046581490ee4e64a2ac0631be8e41bf6250241b2554f62ddf81226fa3970ee80ebb9ec62665ca21f4fec94cc5ebe05414b0c674ad38dd
-EBUILD efivar-0.21-r99.ebuild 647 SHA256
928a508aa44cef30f211b833fe01deeb77dc21f5eb07f87057b37c05d677ea87 SHA512
4a7e81310d5f255f044e2c3200323589d9fcda4ca6313523761d2aa87ebec198efe491c187e04a835e3eea9eecdddc2ad3fac9221b990c351c7e05ac042c55f2
WHIRLPOOL
d0ecf3833b53eb0c32ffe3e6fc756ed79e55acfd34df39a3836388b3f01a14e0288ba77a1322f7d0c33a6649b97474e92ea57bbce20dab107d6fe4a4dff78648
-MISC metadata.xml 326 SHA256
5a6244b5790d2500d54b2126b086e5ec255588d5dafad49acf3673ae7b7fecd6 SHA512
3fc77bb26b1f5a787db71a84a093eee7c0a0e639906947ec30a98ac0336facd6f33a8cee71b852527b6d499c1d568b9cdb1c8b2a046ec93e23151097c85816a0
WHIRLPOOL
fdb21794835f16be96117c5ae83df58064dc9d944a9335a52864389367e1e424021b043930d07091ee0f13fe1d60b8a0953b445fd705089e3a0111402fdb7c83
+DIST efivar-30.tar.gz 86395 SHA256
20709c76311f8eb8be92977b7ac008ce62501fa9f7fe885a784321540fc352f9 SHA512
ab73c2a49175e01cb4872bfb47708a71399c6f8237a02fbbbf4755fcd10efb82984baf76a83c3b3e7f5cf4183050e535cf18dff2bbfed10d9a0f5d4cf2021b32
WHIRLPOOL
d0a7fe13e4359ddafb717b666b81fdecf786f8cc3a794e47a46d80064cd402780feeab5f501f9b0796d3a847b58611b7581341e0e9cb4449d86e75e6903591eb
+EBUILD efivar-0.21.ebuild 744 SHA256
419fb5abcd14e1eb3604156c6e678b0bdf251311456931ffd5fd38972f1f108f SHA512
a69ef35673943e7761e57f17206e3ab1b089ea5bdcad16e081c61291da6c56e31aee4720b7ce193e5e0b58c44f76c722e281965ec1009330ab164f9b6bd6f738
WHIRLPOOL
a36f7122218e0244212f50382271884de1017b147d141e56830a8829d070916b36e304497feba8ec098d12336b376d2046f14f5aaed240b7987df1431e5a4f6c
+EBUILD efivar-30.ebuild 1014 SHA256
386d8218cd312d6f88d32bfa2aa949f4c8c54e3e14ac1f71ed4e9a61f221b0a6 SHA512
18d4ea42b4d0bd48c138cedd09101efc597213f044f01c7dd5b65a4c56f10fe86682af9bd5aa1619e91c30deb8254f15087b2e13ca18b9f6215cd1d1ed10c9c0
WHIRLPOOL
7846501dc60e1b6cd1bf38ca14b6eddc9d417fa54cf83f6016fa188f68a64ab390e359ff79f9cc7cd36624bdd2e96e200729fc115a029ba8b237d47b2e4f38b2
+MISC metadata.xml 329 SHA256
562af8ae9d4eac40cd37ccea2827ecb766176649c836296a10a75dddc4446181 SHA512
a349c5ce7e3ad96d816b52ee35e6547bfb1f4cf9ebd60426ac90b84d67adb0728ab9dcccf93754ad7c71614b0fbd82a1a02fc3fde07e15d12d960d1a7fc088df
WHIRLPOOL
b6c568a210bf85aea3dffae55d3f861fae101047b431b9ed64f60a61ac5b76d4866d63298a8a11e42f78c013388bc932b1fdd73d44a82fa2476138f2521f3444
diff --git a/sys-libs/efivar/efivar-0.21-r99.ebuild
b/sys-libs/efivar/efivar-0.21.ebuild
similarity index 81%
rename from sys-libs/efivar/efivar-0.21-r99.ebuild
rename to sys-libs/efivar/efivar-0.21.ebuild
index 0a76da6..b5d64c3 100644
--- a/sys-libs/efivar/efivar-0.21-r99.ebuild
+++ b/sys-libs/efivar/efivar-0.21.ebuild
@@ -12,14 +12,17 @@
SRC_URI="https://github.com/rhinstaller/${PN}/releases/download/${PV}/${P}.tar.b
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ia64 x86"
RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-3.18"
src_prepare() {
epatch "${FILESDIR}/0.21-initializer.patch"
epatch "${FILESDIR}/0.21-musl.patch"
+ epatch "${FILESDIR}/0.21-nvme_ioctl.h.patch"
+ epatch_user
}
src_configure() {
diff --git a/sys-libs/efivar/efivar-30.ebuild b/sys-libs/efivar/efivar-30.ebuild
new file mode 100644
index 0000000..d5f7ab6
--- /dev/null
+++ b/sys-libs/efivar/efivar-30.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tools and library to manipulate EFI variables"
+HOMEPAGE="https://github.com/rhinstaller/efivar";
+SRC_URI="https://github.com/rhinstaller/efivar/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ia64 ~x86"
+
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-3.18"
+
+src_prepare() {
+ eapply "${FILESDIR}/0.23-musl.patch"
+ eapply "${FILESDIR}/27-strndupa.patch"
+ default
+ sed -i -e s/-Werror// gcc.specs || die
+}
+
+src_configure() {
+ tc-export CC
+
+ # https://github.com/rhinstaller/efivar/issues/64
+ append-cflags -flto
+
+ tc-ld-disable-gold
+ export libdir="/usr/$(get_libdir)"
+ unset LIBS # Bug 562004
+}
+
+src_compile() {
+ # Avoid building static binary/libs
+ opts=(
+ BINTARGETS=efivar
+ STATICLIBTARGETS=
+ )
+ emake "${opts[@]}"
+}
+
+src_install() {
+ emake "${opts[@]}" DESTDIR="${D}" install
+}
diff --git a/sys-libs/efivar/files/0.23-musl.patch
b/sys-libs/efivar/files/0.23-musl.patch
new file mode 100644
index 0000000..f5549d6
--- /dev/null
+++ b/sys-libs/efivar/files/0.23-musl.patch
@@ -0,0 +1,21 @@
+diff -Naur efivar-0.23.orig/src/makeguids.c efivar-0.23/src/makeguids.c
+--- efivar-0.23.orig/src/makeguids.c 2016-02-15 11:38:42.000000000 -0800
++++ efivar-0.23/src/makeguids.c 2016-02-16 17:48:09.605591260 -0800
+@@ -153,13 +153,13 @@
+ #if BYTE_ORDER == BIG_ENDIAN\n\
+ #define cpu_to_be32(n) (n)\n\
+ #define cpu_to_be16(n) (n)\n\
+-#define cpu_to_le32(n) (__bswap_constant_32(n))\n\
+-#define cpu_to_le16(n) (__bswap_constant_16(n))\n\
++#define cpu_to_le32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000
| (n)<<24))\n\
++#define cpu_to_le16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\
+ #else\n\
+ #define cpu_to_le32(n) (n)\n\
+ #define cpu_to_le16(n) (n)\n\
+-#define cpu_to_be32(n) (__bswap_constant_32(n))\n\
+-#define cpu_to_be16(n) (__bswap_constant_16(n))\n\
++#define cpu_to_be32(n) ((uint32_t) ((n)>>24 | (n)>>8&0xff00 | (n)<<8&0xff0000
| (n)<<24))\n\
++#define cpu_to_be16(n) ((uint16_t) ((n)<<8 | (n)>>8))\n\
+ #endif\n\
+ """);
+
diff --git a/sys-libs/efivar/files/27-strndupa.patch
b/sys-libs/efivar/files/27-strndupa.patch
new file mode 100644
index 0000000..287b3bf
--- /dev/null
+++ b/sys-libs/efivar/files/27-strndupa.patch
@@ -0,0 +1,19 @@
+diff -Naur efivar-27.orig/src/linux.c efivar-27/src/linux.c
+--- efivar-27.orig/src/linux.c 2016-08-19 12:28:16.782365757 -0700
++++ efivar-27/src/linux.c 2016-08-19 12:30:12.852460305 -0700
+@@ -48,6 +48,15 @@
+ #include "linux.h"
+ #include "util.h"
+
++#ifndef strndupa
++#define strndupa(s, n) \
++ (__extension__ ({const char *__in = (s); \
++ size_t __len = strnlen (__in, (n)) + 1; \
++ char *__out = (char *) alloca (__len); \
++ __out[__len-1] = '\0'; \
++ (char *) memcpy (__out, __in, __len-1);}))
++#endif
++
+ int
+ __attribute__((__visibility__ ("hidden")))
+ set_disk_and_part_name(struct disk_info *info)
diff --git a/sys-libs/efivar/metadata.xml b/sys-libs/efivar/metadata.xml
index 16d0108..f9d83d4 100644
--- a/sys-libs/efivar/metadata.xml
+++ b/sys-libs/efivar/metadata.xml
@@ -6,6 +6,6 @@
<name>Mike Gilbert</name>
</maintainer>
<upstream>
- <remote-id type="github">vathpela/efivar</remote-id>
+ <remote-id type="github">rhinstaller/efivar</remote-id>
</upstream>
</pkgmetadata>
