commit: e2e406ac279a07384284972918a282496dbeda1b Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Sun Mar 19 00:52:42 2017 +0000 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> CommitDate: Sun Mar 19 00:52:42 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e2e406ac
sys-libs/efivar: sync with upstream sys-libs/efivar/Manifest | 4 ++-- sys-libs/efivar/efivar-30.ebuild | 10 ++++++---- sys-libs/efivar/efivar-31.ebuild | 13 ++++++++++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest index 31eb0d4..5237375 100644 --- a/sys-libs/efivar/Manifest +++ b/sys-libs/efivar/Manifest @@ -2,6 +2,6 @@ AUX 0.23-musl.patch 934 SHA256 8979af4cdc8eefd54209e0ae2c8b3e1bb820bba35de2a788d AUX 27-strndupa.patch 702 SHA256 b53715e85e65794967434d6751f19cf9d2139cbdbd02d1dd870873957deb596b SHA512 746083032316440b83de82680ec51fd5ca195a48977f4a4e3384114104620fdfd115cf408f1baa7e3ca5f7d038a968131a078349d5404b55277b3b8ba0a15607 WHIRLPOOL 02ce9d9e266fb5112a2bde917e835c51fd2094a6ad3222e7df83511dd5d350104ecbe755b2eac5e9cbf07961734799a334356da6a4d359ab8bb251b884914d81 DIST efivar-30.tar.gz 86395 SHA256 20709c76311f8eb8be92977b7ac008ce62501fa9f7fe885a784321540fc352f9 SHA512 ab73c2a49175e01cb4872bfb47708a71399c6f8237a02fbbbf4755fcd10efb82984baf76a83c3b3e7f5cf4183050e535cf18dff2bbfed10d9a0f5d4cf2021b32 WHIRLPOOL d0a7fe13e4359ddafb717b666b81fdecf786f8cc3a794e47a46d80064cd402780feeab5f501f9b0796d3a847b58611b7581341e0e9cb4449d86e75e6903591eb DIST efivar-31.tar.gz 88545 SHA256 b825680dc8b2165cd71131277f5a9cd632f9e43a84a33756543b24e7a251b9e0 SHA512 d8d1c7521f3013b85ea3868dd3a2f1faa77499a43b2e5e16599b154726e079019ed6434c30ae486bb616c6cdeeabf145a049f28d090964777e3fcd299878dcd7 WHIRLPOOL db8e9cade2ccbeb591c7d74452602fea3a630396a770f87c0cfa25ff9c96e998919671dc49b487a3577f0509810324eac4fc9071b905345604e2db658f3e3f43 -EBUILD efivar-30.ebuild 1019 SHA256 d60f2fa2f009d7dd946d6f9e156d9bdc13295b1530fba21efe006c0c5e525aef SHA512 e4f976f3801295de6985103ba2e5ee1981919648e514cb5a1e135276c841fadcaf588cb0676acb78293e99ff7d9b086a02d4b8c07658fd9568e7f296fafbe31f WHIRLPOOL ccefd9b0833f8c2f6a934a78576a84764339ab5a2137bc80ed6d369907c1adda865e3931819d5b301a4980e13c10ddee84eceefee10e84c34d9b4367f4df913f -EBUILD efivar-31.ebuild 758 SHA256 597e8428ee707615ae42915e371c6194021a5134fefb6e7f7e1bd66c328e2d42 SHA512 a402ddbe7c7481c60be2a5ac5794b95aa1f29a36af05e808ac88a6f44e5b88b70c04632d468982530ee2b196e96108e8f57b838ce2479feb07a98b52a9bfb35f WHIRLPOOL 00a393eda3ac10800fb1e19cbe4e567f9cde53b08bb0321cf68e571fadc872578d0f6cf3ca7af05168a6ae88cbfb9550db85cc266a1028884ecf052371bfd773 +EBUILD efivar-30.ebuild 1010 SHA256 833f1e57965a66a1a0187211b55c3620fd89d176e8b702480e67092496700a80 SHA512 d7238b8f408f026fd677f60b465a3c236182e84fbd525a1a852eb07a75be9651f4dc6b27acfe073b7bbde88039e486311ea5b73da60d781350a697217eecbd03 WHIRLPOOL 0dc68a49084fb663a76433d9ee41d8e7875288103db204b965618e05b46fd4d049b8b89f48485e03563c88f80629dd0c66790ebb80fd1b54ea3bf1c6df2bfded +EBUILD efivar-31.ebuild 866 SHA256 70934a0ee5ed6db973626bf9eb27c9c266eede0103c4430e55a5623efaae4304 SHA512 23ebc827859af18177ae1197534bff5bdb8ccf2aea6730adc275c1fc00890c289eb4afbdc81748fb8ade2d66348c0b2d84f4c0d40bcba9bbe94f8b919d58508a WHIRLPOOL c36b8897514128dae91e214cb33633d909e3b45b4b39a86c79318dabe9361ee159beecd1878a3dd427ffbddb33b265a7a23f544c2eb28e5d874ad3fa20363a6e MISC metadata.xml 329 SHA256 562af8ae9d4eac40cd37ccea2827ecb766176649c836296a10a75dddc4446181 SHA512 a349c5ce7e3ad96d816b52ee35e6547bfb1f4cf9ebd60426ac90b84d67adb0728ab9dcccf93754ad7c71614b0fbd82a1a02fc3fde07e15d12d960d1a7fc088df WHIRLPOOL b6c568a210bf85aea3dffae55d3f861fae101047b431b9ed64f60a61ac5b76d4866d63298a8a11e42f78c013388bc932b1fdd73d44a82fa2476138f2521f3444 diff --git a/sys-libs/efivar/efivar-30.ebuild b/sys-libs/efivar/efivar-30.ebuild index c8a3018..e34c52d 100644 --- a/sys-libs/efivar/efivar-30.ebuild +++ b/sys-libs/efivar/efivar-30.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 @@ -12,15 +11,18 @@ SRC_URI="https://github.com/rhinstaller/efivar/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-2" SLOT="0/1" -KEYWORDS="amd64 ~arm64 ~ia64 x86" +KEYWORDS="amd64 ~arm64 ia64 x86" RDEPEND="dev-libs/popt" DEPEND="${RDEPEND} >=sys-kernel/linux-headers-3.18" +PATCHES=( + "${FILESDIR}/0.23-musl.patch" + "${FILESDIR}/27-strndupa.patch" +) + src_prepare() { - eapply "${FILESDIR}/0.23-musl.patch" - eapply "${FILESDIR}/27-strndupa.patch" default sed -i -e s/-Werror// gcc.specs || die } diff --git a/sys-libs/efivar/efivar-31.ebuild b/sys-libs/efivar/efivar-31.ebuild index 33f9c3c..3681e9f 100644 --- a/sys-libs/efivar/efivar-31.ebuild +++ b/sys-libs/efivar/efivar-31.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 @@ -18,9 +17,12 @@ RDEPEND="dev-libs/popt" DEPEND="${RDEPEND} >=sys-kernel/linux-headers-3.18" +PATCHES=( + "${FILESDIR}/0.23-musl.patch" + "${FILESDIR}/27-strndupa.patch" +) + src_prepare() { - eapply "${FILESDIR}/0.23-musl.patch" - eapply "${FILESDIR}/27-strndupa.patch" default sed -i -e s/-Werror// gcc.specs || die } @@ -30,4 +32,9 @@ src_configure() { tc-ld-disable-gold export libdir="/usr/$(get_libdir)" unset LIBS # Bug 562004 + + if [[ -n ${GCC_SPECS} ]]; then + # The environment overrides the command line. + GCC_SPECS+=":${S}/gcc.specs" + fi }
