summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanagiotis Christopoulos <pchrist@gentoo.org>2010-04-18 21:02:31 +0000
committerPanagiotis Christopoulos <pchrist@gentoo.org>2010-04-18 21:02:31 +0000
commit0c8f2569123f5e5aeb6bbdfde014793122bb30ea (patch)
tree6e2c5df3a9f319c09994581256e7eac335a6f277 /dev-libs/libatomic_ops
parentamd64/arm/x86 stable, bug #315197 (diff)
downloadgentoo-2-0c8f2569123f5e5aeb6bbdfde014793122bb30ea.tar.gz
gentoo-2-0c8f2569123f5e5aeb6bbdfde014793122bb30ea.tar.bz2
gentoo-2-0c8f2569123f5e5aeb6bbdfde014793122bb30ea.zip
Apply small patch to fix bug 314825, Thanks to Dan Ziemba < zman0900 at gmail dot com >
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'dev-libs/libatomic_ops')
-rw-r--r--dev-libs/libatomic_ops/ChangeLog8
-rw-r--r--dev-libs/libatomic_ops/files/libatomic_ops-1.2-fix-makefile-am-generic.patch19
-rw-r--r--dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild4
3 files changed, 28 insertions, 3 deletions
diff --git a/dev-libs/libatomic_ops/ChangeLog b/dev-libs/libatomic_ops/ChangeLog
index 48cee9fe3223..835790478b5c 100644
--- a/dev-libs/libatomic_ops/ChangeLog
+++ b/dev-libs/libatomic_ops/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/libatomic_ops
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/ChangeLog,v 1.20 2010/04/09 18:53:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/ChangeLog,v 1.21 2010/04/18 21:02:31 pchrist Exp $
+
+ 18 Apr 2010; Panagiotis Christopoulos <pchrist@gentoo.org>
+ libatomic_ops-1.2-r1.ebuild,
+ +files/libatomic_ops-1.2-fix-makefile-am-generic.patch:
+ Apply small patch to fix bug 314825, Thanks to Dan Ziemba < zman0900 at
+ gmail dot com >
09 Apr 2010; Raúl Porcel <armin76@gentoo.org>
libatomic_ops-1.2-r1.ebuild:
diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-fix-makefile-am-generic.patch b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-fix-makefile-am-generic.patch
new file mode 100644
index 000000000000..7b1f898ef9b6
--- /dev/null
+++ b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-fix-makefile-am-generic.patch
@@ -0,0 +1,19 @@
+diff -u -r a//doc/Makefile.am b//doc/Makefile.am
+--- a//doc/Makefile.am 2005-03-22 00:05:19.000000000 +0200
++++ b//doc/Makefile.am 2010-04-18 20:08:13.000000000 +0300
+@@ -1,3 +1,3 @@
+ # installed documentation
+ #
+-dist_pkgdata_DATA=COPYING LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt
++dist_pkgdata_DATA=COPYING LICENSING.txt README.txt README_stack.txt README_malloc.txt README_win32.txt
+diff -u -r a//src/atomic_ops/sysdeps/Makefile.am b//src/atomic_ops/sysdeps/Makefile.am
+--- a//src/atomic_ops/sysdeps/Makefile.am 2005-09-28 02:53:16.000000000 +0300
++++ b//src/atomic_ops/sysdeps/Makefile.am 2010-04-18 20:04:03.000000000 +0300
+@@ -25,7 +25,6 @@
+ README \
+ \
+ gcc/alpha.h gcc/arm.h gcc/x86.h \
+- gcc/hppa.h gcc/ia64.h \
+ gcc/powerpc.h gcc/sparc.h \
+ gcc/hppa.h gcc/m68k.h gcc/s390.h \
+ gcc/ia64.h gcc/x86_64.h gcc/cris.h \
diff --git a/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild b/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild
index b767fbb13224..bb05b9a5cd2c 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild,v 1.13 2010/04/09 18:53:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild,v 1.14 2010/04/18 21:02:31 pchrist Exp $
inherit eutils autotools
@@ -22,7 +22,7 @@ src_unpack(){
epatch "${FILESDIR}"/${P}-ppc64-load_acquire.patch
epatch "${FILESDIR}"/${P}-ppc-asm.patch
epatch "${FILESDIR}"/${P}-sh4.patch
-
+ epatch "${FILESDIR}"/${P}-fix-makefile-am-generic.patch
eautoreconf
}