summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-09-12 19:15:36 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-09-12 19:15:36 +0000
commit05ab4eb0d72c8d844f0989eaa1fd8eed73a85f69 (patch)
tree79ba9e73e98939afb4b9f64b9c74578ba3075f84 /sys-libs
parentStable for ppc64, wrt bug #480094 (diff)
downloadgentoo-2-05ab4eb0d72c8d844f0989eaa1fd8eed73a85f69.tar.gz
gentoo-2-05ab4eb0d72c8d844f0989eaa1fd8eed73a85f69.tar.bz2
gentoo-2-05ab4eb0d72c8d844f0989eaa1fd8eed73a85f69.zip
Correct LIBLZMA="-lzma" with LIBLZMA="-llzma" (and edit both configure and configure.ac to avoid running eautoreconf only for this) as per #444050 by Marcin Mirosław
(Portage version: 2.2.2/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/libunwind/ChangeLog7
-rw-r--r--sys-libs/libunwind/libunwind-1.1.ebuild8
2 files changed, 12 insertions, 3 deletions
diff --git a/sys-libs/libunwind/ChangeLog b/sys-libs/libunwind/ChangeLog
index f78a50e2f659..574e8e0e36c0 100644
--- a/sys-libs/libunwind/ChangeLog
+++ b/sys-libs/libunwind/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-libs/libunwind
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/ChangeLog,v 1.33 2013/03/17 15:54:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/ChangeLog,v 1.34 2013/09/12 19:15:36 ssuominen Exp $
+
+ 12 Sep 2013; Samuli Suominen <ssuominen@gentoo.org> libunwind-1.1.ebuild:
+ Correct LIBLZMA="-lzma" with LIBLZMA="-llzma" (and edit both configure and
+ configure.ac to avoid running eautoreconf only for this) as per #444050 by
+ Marcin Mirosław
17 Mar 2013; Agostino Sarubbo <ago@gentoo.org> libunwind-1.1.ebuild:
Stable for arm, wrt bug #461394
diff --git a/sys-libs/libunwind/libunwind-1.1.ebuild b/sys-libs/libunwind/libunwind-1.1.ebuild
index 9098f779dcdd..2de35a5195e8 100644
--- a/sys-libs/libunwind/libunwind-1.1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/libunwind-1.1.ebuild,v 1.7 2013/03/17 15:54:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/libunwind-1.1.ebuild,v 1.8 2013/09/12 19:15:36 ssuominen Exp $
-EAPI="4"
+EAPI="5"
inherit eutils
@@ -15,6 +15,8 @@ SLOT="7"
KEYWORDS="amd64 arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="debug debug-frame libatomic lzma static-libs"
+RESTRICT="test" #461958 -- re-enable tests with >1.1 again for retesting, this is here for #461394
+
# We just use the header from libatomic.
RDEPEND="lzma? ( app-arch/xz-utils )"
DEPEND="${RDEPEND}
@@ -28,6 +30,8 @@ src_prepare() {
# These tests like to fail. bleh.
echo 'int main(){return 0;}' > tests/Gtest-dyn1.c
echo 'int main(){return 0;}' > tests/Ltest-dyn1.c
+
+ sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure{,.ac} || die #444050
}
src_configure() {