diff options
| author |   Repository QA checks <repo-qa-checks@gentoo.org> | 2017-02-09 11:45:15 +0000 |
|---|---|---|
| committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2017-02-09 11:45:15 +0000 |
| commit | db3df905ce9d3d326c25cc72842005399d21c121 (patch) | |
| tree | 974e22a8bfef627c9f73b0f27fe58a295a25f512 | |
| parent | 2017-02-09 11:26:20 UTC (diff) | |
| parent | sys-libs/glibc: update 2.24 patchset (diff) | |
| download | gentoo-db3df905ce9d3d326c25cc72842005399d21c121.tar.gz gentoo-db3df905ce9d3d326c25cc72842005399d21c121.tar.bz2 gentoo-db3df905ce9d3d326c25cc72842005399d21c121.zip | |
Merge updates from master
| -rw-r--r-- | eclass/java-utils-2.eclass | 4 | ||||
| -rw-r--r-- | sys-fs/multipath-tools/multipath-tools-0.6.4.ebuild | 3 | ||||
| -rw-r--r-- | sys-libs/glibc/Manifest | 2 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.24.ebuild | 4 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-9999.ebuild | 3 |
5 files changed, 8 insertions, 8 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index c6132199f098..d2af9f292a37 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -23,8 +23,8 @@ IUSE="elibc_FreeBSD" # Make sure we use java-config-2 export WANT_JAVA_CONFIG="2" -# Prefix variables is only available for EAPI>=3 -!use prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}" EPREFIX= EROOT="${ROOT}" +# Prefix variables are only available for EAPI>=3 +has "${EAPI:-0}" 0 1 2 && ED="${D}" EPREFIX= EROOT="${ROOT}" # @VARIABLE: JAVA_PKG_PORTAGE_DEP # @INTERNAL diff --git a/sys-fs/multipath-tools/multipath-tools-0.6.4.ebuild b/sys-fs/multipath-tools/multipath-tools-0.6.4.ebuild index 6d4e372ff10e..97b1aa2feed1 100644 --- a/sys-fs/multipath-tools/multipath-tools-0.6.4.ebuild +++ b/sys-fs/multipath-tools/multipath-tools-0.6.4.ebuild @@ -4,7 +4,7 @@ EAPI=6 -inherit linux-info systemd toolchain-funcs udev vcs-snapshot +inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs DESCRIPTION="Device mapper target autoconfig" HOMEPAGE="http://christophe.varoqui.free.fr/" @@ -66,6 +66,7 @@ src_compile() { # LIBDM_API_FLUSH involves grepping files in /usr/include, # so force the test to go the way we want #411337. emake \ + CC="$(tc-getCC)" \ LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)" } diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 31d8f09648a8..8ab82d6222d3 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -14,5 +14,5 @@ DIST glibc-2.22.tar.xz 12969072 SHA256 eb731406903befef1d8f878a46be75ef862b9056a DIST glibc-2.23-patches-4.tar.bz2 230533 SHA256 5b64a9b30778be79fac8a8c7e2ec7ebb077e136c85d79996ae3d725189d236a4 SHA512 af140a13bbc28070bfec26e041ce562b1cc091d312a82f385becb3ab87ee882d8ea10ac4ec6dcf86f154857527a3383782d46141016047338cebc7c393329cf3 WHIRLPOOL ca7be788c64428bd2bd6e41eee5345ff85dc9ee0987af55f60104a9f03e3019b8fa6a933ba785d3b1b27540c2485160d50499049985271227c07b094db649de3 DIST glibc-2.23-patches-7.tar.bz2 315221 SHA256 97ef9e370ce9b09d8e9b9f6239f7ef94dd837d29b7bfc1404438c63da1d534ac SHA512 c0d0cab0a370acef0b085b0ab09ce868425a12bbb371d0a9ff91dc83a74a0d8d3b541d10c44650b00b7cb155f8ac1f87764e6a6bd9d6bae8a9a904b4df1650ef WHIRLPOOL 128ea1a2eeaad3d95cdf1054d10232a34e8f88d10ed8907a67d9ff02734243d20b21595ca3698a4861d9c65e2a59aedbcf8e399bd1ed879dba1556ce2995ad9b DIST glibc-2.23.tar.xz 13455260 SHA256 94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9 SHA512 b82953388cd028e174cb08f082557bbce0dad8b67b17d31b29f90102fd52a51e03d591448ecb64882a1c1d5303afffc7f6ede85cee4c784a9284fbc9b4ad26cf WHIRLPOOL 7c7e3bf55a89a04bac917b9ca5a1cbb1613f22c427d2766f114b5a36f9635856005b823852ef5d3b73462b577fe4e5865e68e7b64633d48a95fa1e5eaa831a71 -DIST glibc-2.24-patches-3.tar.bz2 59035 SHA256 5d1b6018367b2691babea7604a42252cb47561fa603c9f33b9f0e32d9c22aed3 SHA512 642a0a49961622ee563cac8d54f833126ca73dde60ffa6b59a7472f09cfbed04c688d42ddc097b72f07f9b1038087d5a9973bae6ab1b3cd2701a19e33d44809e WHIRLPOOL a923f9aff83069aebde25483de906f01959887a8b2a3ac44a228820b80390f117bdb04513e4accda12a77d667bda708eeafbd521908876303c53e2d9227761d9 +DIST glibc-2.24-patches-4.tar.bz2 66166 SHA256 87e9f1977b836422969c5d893fdeba139618f6bc85f79d0619c541eeaec74ed4 SHA512 421dc34403f0dcdbbdd37833a6f26025a901fc507dadde916c5b364f59c427f2936dadd4fd56ac02f28fbaadcf4122bd5fabfca8b6f1e8dfe9d3979e28ec0a25 WHIRLPOOL f7691cf0c7510bef2fd2e9b4fb729dfa1885dfb908fd588f49c22334554cc750d565286aea2cd214426abd1d501c0343606e62f168edf3626fd6c5dec279b395 DIST glibc-2.24.tar.xz 13554048 SHA256 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 SHA512 a4cb28a2c51a0cc029ed69da7cba11931a615ba897235590b4f7fad2eaabec9042f8250eaac2a5860997437a69ab13304f10a634000e52c0336b5593b7969adb WHIRLPOOL be82b47fc73f7e780e8e73a5f58b313d8e861d5ea8c4320f95ef0d8c1e125ff011d61dcfc0380be0e83868bd8c3299de1ea662da7fc8d709050e89b2c126e3eb diff --git a/sys-libs/glibc/glibc-2.24.ebuild b/sys-libs/glibc/glibc-2.24.ebuild index f1711844b39e..0b2f2ca3e452 100644 --- a/sys-libs/glibc/glibc-2.24.ebuild +++ b/sys-libs/glibc/glibc-2.24.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI="5" inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing prefix @@ -26,7 +26,7 @@ case ${PV} in ;; esac GCC_BOOTSTRAP_VER="4.7.3-r1" -PATCH_VER="3" # Gentoo patchset +PATCH_VER="4" # Gentoo patchset : ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 9547bc18a81c..e9d140e38717 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -1,8 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="4" +EAPI="5" inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing prefix |