summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-09-19 19:22:50 +0000
committerMike Frysinger <vapier@gentoo.org>2013-09-19 19:22:50 +0000
commit41d6a8f44fe2c6b56134901e5859a6cd80fc954a (patch)
tree528401a57c55d20b8d770a6038f50d6d4274998a /dev-libs/elfutils
parentarm stable, bug #478742 (diff)
downloadhistorical-41d6a8f44fe2c6b56134901e5859a6cd80fc954a.tar.gz
historical-41d6a8f44fe2c6b56134901e5859a6cd80fc954a.tar.bz2
historical-41d6a8f44fe2c6b56134901e5859a6cd80fc954a.zip
Fix building with clang due to small nested function #451986 by Hendrik v. Raven.
Package-Manager: portage-2.2.0/cvs/Linux x86_64 Manifest-Sign-Key: 0xFB7C4156
Diffstat (limited to 'dev-libs/elfutils')
-rw-r--r--dev-libs/elfutils/ChangeLog7
-rw-r--r--dev-libs/elfutils/Manifest31
-rw-r--r--dev-libs/elfutils/elfutils-0.156.ebuild3
-rw-r--r--dev-libs/elfutils/files/elfutils-0.156-nested-funcs.patch36
4 files changed, 60 insertions, 17 deletions
diff --git a/dev-libs/elfutils/ChangeLog b/dev-libs/elfutils/ChangeLog
index 1c7cd56dc30c..0f422db2df38 100644
--- a/dev-libs/elfutils/ChangeLog
+++ b/dev-libs/elfutils/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/elfutils
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.168 2013/08/25 22:48:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.169 2013/09/19 19:22:36 vapier Exp $
+
+ 19 Sep 2013; Mike Frysinger <vapier@gentoo.org>
+ +files/elfutils-0.156-nested-funcs.patch, elfutils-0.156.ebuild:
+ Fix building with clang due to small nested function #451986 by Hendrik v.
+ Raven.
*elfutils-0.156 (25 Aug 2013)
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 5e745c411b2a..c125aa067157 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -5,6 +5,7 @@ AUX elfutils-0.118-PaX-support.patch 954 SHA256 e769e1168dc645ce99655f984f5c19a5
AUX elfutils-0.143-configure.patch 772 SHA256 af91d9c73612d82b3b47099c0dd8e5cfaac1aa6538185e2760ba5ab933ef9091 SHA512 988d9a85339848150023df4193c6fa45a9dc2e3609b16b575ef7e25c4b0eff8b7e1bd188ebc4a5c0ae9b1aeeb16a99ddf1441f53d4a5ec0c88041fee65491c01 WHIRLPOOL 98b0576f049706b6c21765dfe26985bc88f97b5f39ad2ab950944382c06650b25e2ebad47c155924c664c9b56ac822339c0056e3bb0e8156f4f9963946bbadd3
AUX elfutils-0.148-bashifications.patch 760 SHA256 e741d81d4136a1f9a720fcbb67ffbb389cf00f98e344a5102b6c89e77b150c18 SHA512 778899e982021266db3d109ca8eb9c6144e13d98d017fd4d43fbbcc118b2aaebb827dceafc5dc196b437509bbbc4a95d4b152fa493f3a94c2daaa9da2dc91f74 WHIRLPOOL 1f78c567d5460097d8ed0f5756208bb0ef74c41e8a41db16c85fa28d9bc858a71c4ccd5d2978c596d0b12ae57c9a094e8f9062f7b580db93772e38b92c5707ba
AUX elfutils-0.150-bashifications.patch 763 SHA256 8a7f67e8adeb3ae1aeeb0b3302ed1cda10f852d3f6702d21dfb011761a2b7576 SHA512 d111c043a47f9c6bbb9e51393ad496be79618c6fda50da7870bec6998a295835e68dc0b3dc38bc2a7bbe98b2f894fc4f3c46985a4faf3bc76d92d3b5dbd845b6 WHIRLPOOL 60fbabd765c6c93c64ae81413173347d611c8f34adb38d4fb274f9f830cfedaa5e70a0009be826f4f3ee06dd5196aa480b0c7b38d3a35541037a50d3ee730d1d
+AUX elfutils-0.156-nested-funcs.patch 796 SHA256 2ca9a2ee8c55ca77dceb8db814c3337c418b8be42f2528deb2fce1f3e1f90db5 SHA512 c577b76f79543bf3a87cb4b2b7b9e5cabec566ed7452effb5b541251652a26b5eefe4a9887579dfd81f2f561d437608145427c0651f6e98cc7262e65a8d82487 WHIRLPOOL 495b729ccc90d5c67e0bcf63562424892c84eab63145e060aa5e0bbcafe2e56923a2f144198e6951163ea4a6d75af81d277a198f8b1f53e4bd8fed8986693efa
DIST elfutils-0.146.tar.bz2 1791373 SHA256 dacd9419cc9ef36463f22cd7d7204ee7490904000045a8cdcbf3569907ecf2c8 SHA512 8c93d882b261502576051e3fc41f1469a7d2195813690792fdc104ce87dd39755f867802de0f1c2e224177a1a52671572178fcd4779287c0f5565b186fa598c5 WHIRLPOOL 5583c968dbe19e4efab6e870c8b3cf3576ae171ab241e52948a6cd850e12ba6c3b11560b931559e056fcac0217d6d62ebfcb56afadd19d916f7a2997116916be
DIST elfutils-0.148.tar.bz2 1811640 SHA256 8aebfa4a745db21cf5429c9541fe482729b62efc7e53e9110151b4169fe887da SHA512 9282945c19a98e14dbfbd50f9fd35b3575d1361c64c865c7205a3207bd23d982ee8288b26de3d627430a7cd4b0594e67b4ce956ec482d91a4f4d03dcda01de14 WHIRLPOOL fe9ffdb4934c3d3d7bfad4df6813d913020a01c231ef788a5bfec4a45cdb89f5df1abc64a211383a3a3fee66f41efad03a7607d8892a02aba5c8bbba3bf767cc
DIST elfutils-0.149.tar.bz2 1821994 SHA256 b81f73db935cdb5c0ddfdb4fd36aa0597b691b9204c62e5ee6bcb8c8ffabc808 SHA512 4ad5d9bc64575c7f7b397b129c197639c690957b0556cec628d97d9b12eb353a49fb27b6df3df23a4a90e7a783ab6457d44d0c27e5bb657ba87514b0600c4aeb WHIRLPOOL df5cb7e73a741177b18aca4c5573eae9b6f01cd17400f482c79b89868af4d76e8192d7a210fe17f4165d99387410dc5bca8faa06464a488934e2efa1534a8894
@@ -37,23 +38,23 @@ EBUILD elfutils-0.154-r1.ebuild 2314 SHA256 46f6caf85d4af2d0b29f0c547e71222ef2c5
EBUILD elfutils-0.154.ebuild 2048 SHA256 fcaef5aa4144bb9fd6e3bec5a6222e714409a35cd9190660ddc2263eb4497a3b SHA512 f264d23923b3e63f2086ff896d6668ebe285743d929697886f2d513e57b14b8ecf4fd32c8a78f2dad1c755e986431d36af2ef063c2170af90515d93ab6118497 WHIRLPOOL d1ef17d685a4b88cb49d42b1905a2f56733b4102c0b2c23e605dd14bbfeb4507ad2fe8d3fbb52c7fd9df805e44e38d7c75b1cd0c5687d5803dca7a8b5de3bfb3
EBUILD elfutils-0.155-r1.ebuild 2662 SHA256 6441158515fac574e344e4d48ba7c40ac7532abe0b19f8b37c82c18a5af03b82 SHA512 7f468c5069523276002311e9691ade0236a54705bdd715ae132f2e1d28a9a3e46e07e49e774697c207d9f54e13d8a88b0ceb91318063febd7e0913b71e2a80ad WHIRLPOOL b7d461d1c3642f77d0b5472b9d45e81092f30dac6d12202c0f21042776fe293194ec4129b693bf3295e48f55955d76acbb98393d3cf7e22ab89495c38b8e69c4
EBUILD elfutils-0.155.ebuild 2323 SHA256 d1fd26666413017d59433378579580b6fcc38bf822f90bb3abe068329a71f6d7 SHA512 067e247a694d3e4e2a6f4c851dd25855c795bb4b30e71d148fe418559855cc067ba9ee70d7b0fa29cefd12f1d4b321aa8ef364b325cf49de8a262a80dce6ea10 WHIRLPOOL a6b13255de58604d78c9298350a11c1ba34e9a3dad2d09e1eca6ab1c17141ea468fa1b06623b453c78f151a6b71b5eb8338f3684fd692d8219bab76be5d1fbf8
-EBUILD elfutils-0.156.ebuild 2657 SHA256 71e389210f579b0744414f97bfc24eafb0144587dad049befb343188431bb1b8 SHA512 04c45fddf81113390152917bcb00d0b686d89895dffd632a320c523b68d46796efc2d44a4e1d168e3fcdad29bde1490ea4d29583f5090f7eaf78546ab7234cf8 WHIRLPOOL 40059b66585807554e9ca50c929ffc05b728fb1b33a056586443d50ca15a70a7107a475621d4011ebdbb2ecdcd66ff501ce7ae8c776a845cd6303cbd5d2fb86e
-MISC ChangeLog 22828 SHA256 1c9b36ea72c6409d8e3d6ba3006271518ece43ac947a781d703b5345c68d0000 SHA512 47ecab95a66210eff2d481be8fc2c9d453c198ee3aa2a9710976542fe97efd668498c8bde56a2da353136f29cdd81ea7b5018c01e98e52a26ee2853fc8731625 WHIRLPOOL 3b3b9758abe0065cd2cd5225c2094d42acad44afc9e77444c30480e77b5ac65950982131722fe15935b86334388aa66d08823f2c603acf15a90c6727bf3e8a7d
+EBUILD elfutils-0.156.ebuild 2711 SHA256 8abae436e790113103377fb5643d83b48beb548e1662c17571fc4b11ee45bae8 SHA512 8773d204c2189cc90d0a5a00820397b102982a55ed3dff2c0ff0cba9aed73fd69f3da3259ccea48df71a3e51c044645ad8c7a32bf7f80eddfe8bad2800c1571c WHIRLPOOL cdef5a8d0f70f7205a067c93c681c1220e073567f3dc4013bd886616ca506dc6a71f86f2586b8332608f2d20bfc7b5fe6432fa73afff614215df23ffa5378191
+MISC ChangeLog 23032 SHA256 17a36e1e900ddf567d2b85518be9db8cec54a322db5af6a2f393429c253dfbd2 SHA512 bb1964f6d6bc43f91bfcfe3898dc05e1283c673028d2ac1908aa34fff3c882c83d33772c74c64b0256e980e64283db8c732b94d34399950f0fdce07ef437582f WHIRLPOOL c426cea45c817e1cc8c3c20a5b9dc24b428ccb65c19e3d08328458bdc5c574435dd44bb09d8ad06836f83fc19dc55950445cce7d6e2d815debeff87e7e1e6da0
MISC metadata.xml 438 SHA256 33cbcbd727257fa6d03488d531c099d33f4c3e4db3cf3739d11d8d4cd8266b37 SHA512 e013123116aa3a3f00fa77cc3e9d18a5c1f481dd304ee6af6e77e3e5e44fb9e3f94ac542fc10fb0c59dea6699c15cce11b1513c061494919f1e821120fb162d9 WHIRLPOOL f07f16d5235c538cef44daca3210ad7374af35705b6562b9bb17b2a5532ba0ed6ea32d1d7f23e93c899e8868503f7a9f8994d2454ca144c45ae7e9317fb0cabd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQIcBAEBCAAGBQJSGomxAAoJELEHsLL7fEFWLjMP+wVYrjsdNzaW9MjWvaSGW/sL
-uCU2DUGqzTpdeaxvg0KZ/i5qC48lEzh4oySCtFzxPS94bAn/qukTpzkenD71RX5q
-OTewgWu6P/sg05Z9efnpBdystKhQ6NDlsaJhF0WyqrTZAXedJLG2yswM0ZfCGBwr
-pRO3uTHkkHZ4g86xRNNh0Es+UxxybM2VJCcDtj29Vml26ILV+wbQM+TkMFPcVROR
-hLso2Zf1QSUmgPArQjRVoapYc1ru7MS8fHWIkH9bCQTbKE8R75iQiJG2x1hELuXO
-f7pxDJf0Kn8ohiQMXOEUMMgT8iRy2gqV6PdcuUGvYU0T59szAUN/hOa8SXu0NnnR
-dOghuTcXrXlgiVWp49GtXOMC+0WLCiDjSQyb2nKN+mmEbslpzT1VyBsTD7WsVFw8
-yL0NvFx4pfz02PDtJkRJJtdPg3xrOv5HL7RyH5Fzdm1EsNBZydm6aiiH6FoiAsT3
-sJYfSTl07zaaxok18W86gjCMp1NIdtKtkT2kzU2pd1BNMpbNw7spmyRel+ezEvps
-li6mw0SMT4G487+imI8z6e7WWpgqdvD4Dam7xmKoWf28dlf1/uTuZkq1x14XqQ8I
-QmJd7Xow3aieNopA27+13nNW8jTiRTUwH/03R/HSJEmQuixMN8CLgPocqQBqkTjo
-90OfhhuU1vZ1Wonh1bwN
-=2mJ1
+iQIcBAEBCAAGBQJSO08KAAoJELEHsLL7fEFWTV8P/RYG3Iz6rhgqKFLDKsSXA6uC
+PMAL8oZ7II32VJbKRkMbC95+jdERrfsgNs6JKI4nYBX7SMfa8TQ+0GQQrCSqvYsS
+nSehhroBA0Zlt8kJHG3tomK7IKr8G34ONxdgvV6uCBbt7uzkSnOIUgImElvdZdp0
+vsGYr5Vyygq/KZqX9fQu1txbRG9QZOND/jsT8QA3r5bDqSxLW7JGxOjV2oDuTUX5
+DHxv7vUrI2kzhjAmPsY3XNaDOFrfD1Petvc/NkwSy/b7vx/jnK4s7rYKRdL+HTb3
+NVMIS4T2HZIUrOI4WzbuIE/0jvMpl+3J8Dfe8AZbXpIl76bwsUttPiM/kD3N9mor
+N5/wMSokGHiN/fTVtHjvlf1zlKr5S0JUZ1RkeOl/LxZWV+Ob+iRwnh4XcE273hpR
+6tLQj99+zxbKy3wNkPhb/Nazn9HBj9z94mcrtEBqzsvPIjUYMKzbPDGu+144r4Gd
+fS/8THTlRWGQitOJIkwYS2MU9/fsZgpXYpHge44OkaVKZ9gW7/d+1uSJGVzdNsTL
+7l9K+n7+NNg9ntNveL2VwowZC9Ki6fER700o0R8feo6u8fSm7hd5cFH/dKu1svAF
+eNJKha/iMVeBe+AYY7d6ESG58DlAo7CWZD/UHiZoaJx8yK7tjXUrPv78UCYGdtVG
+8D7EQwJstoVuSWO1J+rs
+=8As2
-----END PGP SIGNATURE-----
diff --git a/dev-libs/elfutils/elfutils-0.156.ebuild b/dev-libs/elfutils/elfutils-0.156.ebuild
index ff8a31ce6a3f..0b4087fd6007 100644
--- a/dev-libs/elfutils/elfutils-0.156.ebuild
+++ b/dev-libs/elfutils/elfutils-0.156.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.156.ebuild,v 1.1 2013/08/25 22:48:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.156.ebuild,v 1.2 2013/09/19 19:22:36 vapier Exp $
EAPI="4"
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.118-PaX-support.patch
epatch "${DISTDIR}"/${P}-{portability,robustify}.patch
+ epatch "${FILESDIR}"/${P}-nested-funcs.patch #451986
sed -i -e 's:-Werror::g' $(find -name Makefile.in) || die
use test || sed -i -e 's: tests::' Makefile.in #226349
use static-libs || sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in
diff --git a/dev-libs/elfutils/files/elfutils-0.156-nested-funcs.patch b/dev-libs/elfutils/files/elfutils-0.156-nested-funcs.patch
new file mode 100644
index 000000000000..f658a8f3e21e
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.156-nested-funcs.patch
@@ -0,0 +1,36 @@
+clang does not like nested funcs. use a define instead.
+
+https://bugs.gentoo.org/451986
+
+--- a/libelf/elf_begin.c
++++ b/libelf/elf_begin.c
+@@ -1011,18 +1011,17 @@ elf_begin (fildes, cmd, ref)
+ return NULL;
+ }
+
+- Elf *lock_dup_elf ()
+- {
+- /* We need wrlock to dup an archive. */
+- if (ref->kind == ELF_K_AR)
+- {
+- rwlock_unlock (ref->lock);
+- rwlock_wrlock (ref->lock);
+- }
+-
+- /* Duplicate the descriptor. */
+- return dup_elf (fildes, cmd, ref);
+- }
++#define lock_dup_elf() \
++ ({ \
++ /* We need wrlock to dup an archive. */ \
++ if (ref->kind == ELF_K_AR) \
++ { \
++ rwlock_unlock (ref->lock); \
++ rwlock_wrlock (ref->lock); \
++ } \
++ /* Duplicate the descriptor. */ \
++ dup_elf (fildes, cmd, ref); \
++ })
+
+ switch (cmd)
+ {