Gentoo Archives: gentoo-commits

From: Aric Belsito <lluixhi@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: sys-libs/libselinux/
Date: Tue, 28 Feb 2017 18:20:32
Message-Id: 1488305839.a4d21f537fbab72a079c794f79b7c0a616f24c69.lluixhi@gentoo
1 commit: a4d21f537fbab72a079c794f79b7c0a616f24c69
2 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
3 AuthorDate: Tue Feb 28 18:17:19 2017 +0000
4 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
5 CommitDate: Tue Feb 28 18:17:19 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a4d21f53
7
8 sys-libs/libselinux: sync with upstream
9
10 sys-libs/libselinux/Manifest | 2 +-
11 sys-libs/libselinux/libselinux-2.6.ebuild | 8 ++++----
12 2 files changed, 5 insertions(+), 5 deletions(-)
13
14 diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
15 index 02efa12..023a969 100644
16 --- a/sys-libs/libselinux/Manifest
17 +++ b/sys-libs/libselinux/Manifest
18 @@ -1,4 +1,4 @@
19 AUX libselinux-2.6-0007-build-related-fixes-bug-500674.patch 3580 SHA256 a9803f0f0876b12d909aa16da3968f80ed44fd56a59e2737df6196097ea59c4d SHA512 51c3b1bc1541b8b97ef7a25b01740cc6d05ee7bf7f6264e1f5d78e4fba02c957d48c437826d797354f295a92e53f51957e3e8c68d7ea1ba1113458c0b964ea23 WHIRLPOOL b8bf31c73401950afd7b11e57746399b214fb77cd8a1c3cc853d86c95f30665941e736782fd625b37af976c905cd467f9304c8c115ee541bd896edd8e1cec4df
20 DIST libselinux-2.6.tar.gz 203119 SHA256 4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a SHA512 906e1bf98c669862ab4f4e883d511db8d739a5763dc857c9405ad3cc6c70766a482853d07134698a1a98257a8632cc756d0549a7640c2915d051714f502ff14b WHIRLPOOL bf60ce907b7057ada5d19e3a0cd1f092a7dfc2de774e504762424c325c657a4f144fbe252e7d908f7c6d902d80388517e15134a289f4358e564c8720ea6534d9
21 -EBUILD libselinux-2.6.ebuild 4430 SHA256 caae61333c7514cc687d084799b6e75079548e0c7e350b56e66daa532fda630a SHA512 cc5bf39c23a62c5b3fe25fcd9032219ea42dfd9afb70c46c356e22cf4b7e0c20d365764e4e09d2a5d9542f48e8bb0f5a3f7bd11a534b4c63fb9c6b9d7b1e869a WHIRLPOOL 9f3a783ffe5f4cc5dc6be8b588600f1a1f86ac3e339d65bfb521eeea04c1118774da3fe2654dc9690a1c23244d6fc8cc1cdbeacf49bdc8f12a2f60906e199449
22 +EBUILD libselinux-2.6.ebuild 4442 SHA256 a3b6ef729d94d8fcbbf63cfae9afedc805e92b7e06d57c157e62c71b01a72259 SHA512 de6ae67995c2782cdc5698b88a6beca6f0474aec67da5b73f36e2f4af3b488751d39ab17422b11f15af1a70671154325ab4f531cd14208dbfe3c2418fbc17885 WHIRLPOOL ba1a3aba1617eb3e4b4d6058602f5d0c1f16192fd45b4193f7b9f790633037f6ff8323e768f1a2c711dad805124da70a1afeb4d2b2b2fead4b8b3273941bc0c7
23 MISC metadata.xml 676 SHA256 288211da34dc4cabaeaa85c52462c3ad2792347abbf88f78eae812a4e3dc8c8c SHA512 7b33e0d113637a129a7894d8720feb9024d67466b86d475fbc3398f514b2ecc28c70dc759952376208d2022a00658eb120fc3561edbb9c7ecdc4404bed5f57a7 WHIRLPOOL bd4938862e3ec119c1da448d5bc8c99a6063704a65c8a906514f5160adf65851af64c6a1c4626e97438e9f4a7288ef002b06a876b9d73e67d70e38ca31cc1319
24
25 diff --git a/sys-libs/libselinux/libselinux-2.6.ebuild b/sys-libs/libselinux/libselinux-2.6.ebuild
26 index 17308f0..33b9bbf 100644
27 --- a/sys-libs/libselinux/libselinux-2.6.ebuild
28 +++ b/sys-libs/libselinux/libselinux-2.6.ebuild
29 @@ -1,9 +1,9 @@
30 -# Copyright 1999-2016 Gentoo Foundation
31 +# Copyright 1999-2017 Gentoo Foundation
32 # Distributed under the terms of the GNU General Public License v2
33 # $Id$
34
35 EAPI="6"
36 -PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
37 +PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
38 USE_RUBY="ruby21 ruby22 ruby23"
39
40 # No, I am not calling ruby-ng
41 @@ -72,7 +72,7 @@ multilib_src_compile() {
42 python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
43 emake \
44 PYINC="-I${PYTHON_INCLUDEDIR}" \
45 - LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
46 + LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
47 FTS_LDFLAGS="$(usex elibc_musl '-lfts' '')" \
48 LIBDIR="\$(PREFIX)/$(get_libdir)" \
49 SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
50 @@ -89,7 +89,7 @@ multilib_src_compile() {
51 rm -f src/selinuxswig_ruby_wrap.lo || die
52 emake \
53 RUBY=${1} \
54 - LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
55 + LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
56 FTS_LDFLAGS="$(usex elibc_musl '-lfts' '')" \
57 LIBDIR="\$(PREFIX)/$(get_libdir)" \
58 SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \