gentoo resync : 10.11.2017

3 files changed, 38 insertions, 2 deletions

diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 38413feac882..f2af7a69a308 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1,9 +1,10 @@
+AUX systemtap-3.1-ia64.patch 885 SHA256 278d4338c4a494f72f7a207efb79b3709fe95141e1252fe06384f0a5e9b38984 SHA512 a9f068dafc2fb4c96696d8cfe1501fc3610f4ab0aaea9a20ffc5f57cda09561f9712896616c548661bbbc5c10dfe275d218c7b232645a5240507c80bec1850cd WHIRLPOOL 29c85258ad4ab5fdfc913dcccf19e3036358d7c70c5f0fef5fd5521d60669c0b20c8b44390c73aefe11ccfc5ee274cadab4042c65cd6ecf5757ce21078fb86ec
 DIST systemtap-2.4.tar.gz 2664988 SHA256 fdcee37c4db188819a69f67a72ad1977251e80673cebf729a443b6c00be779f4 SHA512 40c30942eb50948f11f06f9f37c76d96f5ebc8eb6d164c9af5d54845b3f43f38594ddebf5f0d42ac4704b0a2563cd23edf818c196ee1330db00011a85ae11b0c WHIRLPOOL 7441504b167b9f90da52abb7f0c934263c9ce984de4caedc43f3694c7a1c492fe7c5bdd56357d7eebc8d306aea6873cdf8c0dadb0fafcc4f0bb192d5e9cfb9d3
 DIST systemtap-2.9.tar.gz 3258026 SHA256 04f2c607512f4867f345a3d173940e1023441c5d3560f2e580b4a82dfe4d6353 SHA512 00d24ad52d5634b540241a9fc64efbab7fa1d34d31a0254b43474101d3024f050ab7ec284aba0c082889066e1b4cf4c38799801910bff7516ca2e380684089dc WHIRLPOOL fa8d3978f0768091c5cc3bd1cd4b13b6ff9643e2e37ee8e8b59c1801fd7ddcad7029d06e4a1207dc5add5faf423de9ccdb9df677b7db88a5199b1fde731fcb3a
 DIST systemtap-3.1.tar.gz 4885480 SHA256 a7b679877502db9b3ac9dfb658c05b49f77e29d42ad2eb36105b62bf2d32f676 SHA512 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d WHIRLPOOL ebb6c085c74747e54434c4ca6b6cf840bc3268dfb66cf95cd7a51553c73b75f4b34ab76ea715163986b601e5ffbaa8340a88dfa5cc203537856c30a3d88fa5c4
 EBUILD systemtap-2.4-r1.ebuild 1999 SHA256 e036dc241ba8779ebf27d0fd21dac609a466931d37b8741a532b07db7e521136 SHA512 930ff6b23986fa9c6ddaa5655db7fd7eb3dbe4e0e1039d14aeedc1993aa89eda63029e50768413c1182793c209a55c41fefac9ea03a673108e142d92f45491d1 WHIRLPOOL 5b4cf502cdfaf6fe13e8da1e69072d1e545820a2e6fc1b5a0c544c7f4501442950325f4b2d8c4c5e846a787630813608ef5462f9c4ad40dc995b68f01cc9012c
 EBUILD systemtap-2.9.ebuild 2029 SHA256 7e227ab12188ea134f435871faa79e98e7e2dd0b59fe4fcfb00474b48599db99 SHA512 e85f7c8f9bdf73b54f11090850e2a401f7ed0978a80281e9b1b6a126dea14f0dc117c71a63e1cd48fec96008812b47b40aa375fd5eae31bd04777666c7955b06 WHIRLPOOL d5861dfcd84548beff94ce6dc8e0124b6258224883634ff058e15f76d1c326ec59563324ca4fb959f964dde1b6e8d87f7bc6dead54a05fab96f7483e6f315b4c
-EBUILD systemtap-3.1-r1.ebuild 2106 SHA256 bbc6c016231aab7000fd8e5384e2fc6604e2ad516135fe993bbf4133138d65ba SHA512 74a60c0917c2e77fa71f09f25e7d76f2bdc75032945fb76a3e76eae854aeefe872a8d78ac7bcf5230fd95eae7fefc97e00dde40e93271907baf0a3ac9d0eb5fe WHIRLPOOL 89f4864384a44cb4580bfe554f18f9f7917babf69b6acf8b84da9b7272699903907259f79ddc67710e6a38b0708dbdcef43599975a3e3fa3a1c9e53256d2cd76
+EBUILD systemtap-3.1-r1.ebuild 2150 SHA256 76f5e1921b41529a9f3e33a804c52c5c19701c7b0ebb1c75b80383ba89781fb8 SHA512 1e6aa3b01fa8efbb3871c28e46c454c5119579dde0e451fc6d46d0abc307b2c3bd59abfc19d158d21f04f271fe0931c8865f9ffe9b97675a0d01c92494eed8bc WHIRLPOOL 04a1bd456b69e621ffb32500b6241b7be6253ea0358f4cee6186bb4db026c139fd9d061bc3a6c54dac6b7e531371a9bbec97b36a571aa258cc6f39eeb0978632
 EBUILD systemtap-3.1.ebuild 2025 SHA256 f9f8c5e5256023182a9c4133728ff881f3b71e93c83cd92e02a2184c270a309d SHA512 eaf7f9e37a7ea1ad61b4193f20414c500f662a61bb19d799b60d84722dc7dffbfecb112326e9cb23fd14e26b4a6d9bc46f1f6431736b8e7f63f4c772ac103893 WHIRLPOOL b3208f7e9f5bf3d5fd70b4acebb0d9919cb2a417367d91c43ef608827516237e686e2541d8d772f43ca566d98ccabbe92aa5fc793719fa1b9b95dc26a93a5e10
 MISC ChangeLog 2897 SHA256 9f126d03a53fc3e6ee4f1b2564fd12afbb5562e0a4ea532c94e977dbf1704a9f SHA512 1ff92e3ab4904c650618a708255eb87d07a60650f9f587d5b1b582465037cc88b9e4fcaa46f5b8cd9689ba7efbe2ec01acec021580e0a273e3db0d67d4725fd4 WHIRLPOOL 55526412784dfb2d328b33e41f06ee657a31f7e2ba947a62fea51415356360e7f300160f3bb99676e011503fb7beacc163980fb132f4dabe593dace786e8a542
 MISC ChangeLog-2015 20184 SHA256 959e517e7b3fe2cfb593f1d9181aacdfbb1ddacbfc972f80f1312f71db215751 SHA512 3dc443727de960e7a94365e886d94303b2801d51b491d9b602c2b536280789662c8c67f2834d3531aafbb13b16f3102d6584074cf477b8ed27761d8a62d4f344 WHIRLPOOL e82a32819f5e23419694d0ad2c707e81460a7e781c501b61d8e4b5f5468ff87baafcb3a7dac53b4b5b5c543c82eca9c734438a04860e32ab78a2af79f21a1b4d
diff --git a/dev-util/systemtap/files/systemtap-3.1-ia64.patch b/dev-util/systemtap/files/systemtap-3.1-ia64.patch
new file mode 100644
index 000000000000..832bfc1a47f9
--- /dev/null
+++ b/dev-util/systemtap/files/systemtap-3.1-ia64.patch
@@ -0,0 +1,33 @@
+Workaround build failure on ia64
+
+Avoid 'o' constraint to allow gcc to select register operand.
+That way instruction selector can satisfy all constraints
+for PROBE2 macro.
+
+Reported-by: Émeric Maschino
+Bug: https://bugs.gentoo.org/510134
+--- a/cache.cxx
++++ b/cache.cxx
+@@ -8,2 +8,10 @@
+ 
++#ifdef __ia64__
++// Default is: nor
++// We disable 'o' because gcc fails to select register
++// constraint for second instruction in 'add_script_to_cache'
++//     https://bugs.gentoo.org/510134
++#    define STAP_SDT_ARG_CONSTRAINT nr
++#endif
++
+ #include "config.h"
+--- a/staprun/mainloop.c
++++ b/staprun/mainloop.c
+@@ -1 +1,9 @@
++#ifdef __ia64__
++// Default is: nor
++// We disable 'o' because gcc fails to select register
++// constraint for second instruction in 'add_script_to_cache'
++//     https://bugs.gentoo.org/510134
++#    define STAP_SDT_ARG_CONSTRAINT nr
++#endif
++
+ /* -*- linux-c -*-
diff --git a/dev-util/systemtap/systemtap-3.1-r1.ebuild b/dev-util/systemtap/systemtap-3.1-r1.ebuild
index cd13a9e21c2e..e025bb2783bc 100644
--- a/dev-util/systemtap/systemtap-3.1-r1.ebuild
+++ b/dev-util/systemtap/systemtap-3.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="libvirt sqlite"
 
 RDEPEND=">=dev-libs/elfutils-0.142
@@ -33,6 +33,8 @@ ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) -
 
 DOCS="AUTHORS HACKING NEWS README"
 
+PATCHES=("${FILESDIR}"/${PN}-3.1-ia64.patch)
+
 pkg_setup() {
 	linux-info_pkg_setup
 	python-single-r1_pkg_setup