diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-09 09:27:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-09 09:27:03 +0100 |
| commit | cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch) | |
| tree | 047fc92023c520d07f13ec5ac96e094d1b312a7a /app-crypt/efitools | |
| parent | 7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff) | |
gentoo resync : 09.06.2018
Diffstat (limited to 'app-crypt/efitools')
| -rw-r--r-- | app-crypt/efitools/Manifest | 2 | ||||
| -rw-r--r-- | app-crypt/efitools/efitools-1.8.1.ebuild | 24 |
2 files changed, 19 insertions, 7 deletions
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest index 1ec70041d790..8ad74531f11e 100644 --- a/app-crypt/efitools/Manifest +++ b/app-crypt/efitools/Manifest @@ -3,5 +3,5 @@ AUX efitools-1.8.1-libressl-compatibility.patch 495 BLAKE2B 8c4aa46f422012b36601 DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B b0042df906282d878b1400c359c1eece24588f5df7ab753b62f5f0b95e97467cfaa17e04a2ef40a7ec85155c4d13bd438dd94471e0ec98ab23030dd54e7d4214 SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a EBUILD efitools-1.7.0.ebuild 786 BLAKE2B 8a842f23c5e7ec1afa535dfd7448503a1313cd026eaab72961a517ca223d04ac521cd6ce7c98c920de079c33549b164aa544b44fdfe73c76bd46e7444da2fb28 SHA512 40132fc48114b2baebb590e1b6ac4a32961c1ab6d7393ecf80223fab6bffb6cccc8da1123c67f967602982a23ecc82a1f106856d39ba73862ce5ddf2162d3e18 -EBUILD efitools-1.8.1.ebuild 1030 BLAKE2B 869a7a8a299dac60eeedd0ccb990f96cb151cab36ca68cec602f5f5424609be59fc5c4bfb4b90e42a045bc552ae47f0a0ac8cab326ba5d15fed0460ebe1fb2a5 SHA512 0df50584ba254e4f8f18f852b7c43c461ea10f0dc4be8d597979a657011c3485a0410e2bc746ec46dc9449578adccd692d8530c76d66267e3f3c55d7ed213a45 +EBUILD efitools-1.8.1.ebuild 1348 BLAKE2B fedfa56aa7e7397104b0ad32484e145a2cf1a1cf9caa7cec8e8d84d6c861a2c4f705d6b43998b27eebbce28de04a47c73c8dfc9dd7653079ea07c58ef02ab51c SHA512 9edd70850f64534bcd8c48d7d87ae5dba074f8bae0b884208ed888055853832e2452550e302963e509c89185f10010b5d22081b07ddd92ca7db73951292e1216 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild b/app-crypt/efitools/efitools-1.8.1.ebuild index f18e8b8ea271..6ede95860eb5 100644 --- a/app-crypt/efitools/efitools-1.8.1.ebuild +++ b/app-crypt/efitools/efitools-1.8.1.ebuild @@ -3,31 +3,43 @@ EAPI=6 -inherit flag-o-matic +inherit flag-o-matic toolchain-funcs DESCRIPTION="Tools for manipulating UEFI secure boot platforms" HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git" -SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/efitools-1.8.1.tar.gz" +SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="libressl" +IUSE="libressl static" -RDEPEND="!libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) +LIB_DEPEND="!libressl? ( dev-libs/openssl:0=[static-libs(+)] ) + libressl? ( dev-libs/libressl:0=[static-libs(+)] )" + +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) sys-apps/util-linux" DEPEND="${RDEPEND} app-crypt/sbsigntool dev-perl/File-Slurp + static? ( ${LIB_DEPEND} ) sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${P}-libressl-compatibility.patch" ) +PATCHES=( + "${FILESDIR}/1.7.0-Make.rules.patch" + "${FILESDIR}/${P}-libressl-compatibility.patch" +) src_prepare() { + if use static; then + append-ldflags -static + sed -i "s/-lcrypto\b/$($(tc-getPKG_CONFIG) --static --libs libcrypto)/g" \ + Makefile || die + fi + # Respect users CFLAGS sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die |