From 18ba0bc495a737f765e4a6da70479ef4ec392d74 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 2 Feb 2010 16:21:05 +0000 Subject: libatomics-ops: Fix with recent autoconf/automake Signed-off-by: Richard Purdie --- .../pulseaudio/libatomics-ops/doublefix.patch | 25 ++++++++++++++++++++++ .../packages/pulseaudio/libatomics-ops_1.2.bb | 5 +++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 meta-moblin/packages/pulseaudio/libatomics-ops/doublefix.patch (limited to 'meta-moblin') diff --git a/meta-moblin/packages/pulseaudio/libatomics-ops/doublefix.patch b/meta-moblin/packages/pulseaudio/libatomics-ops/doublefix.patch new file mode 100644 index 0000000000..2172cac41e --- /dev/null +++ b/meta-moblin/packages/pulseaudio/libatomics-ops/doublefix.patch @@ -0,0 +1,25 @@ +Double path references breaks recent autoconf+automake + +RP 2/1/10 + +Index: libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am +=================================================================== +--- libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/Makefile.am 2005-09-28 00:53:16.000000000 +0100 ++++ libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am 2010-02-01 14:28:46.397820574 +0000 +@@ -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 \ +Index: libatomic_ops-1.2/doc/Makefile.am +=================================================================== +--- libatomic_ops-1.2.orig/doc/Makefile.am 2010-02-01 15:20:09.207788884 +0000 ++++ libatomic_ops-1.2/doc/Makefile.am 2010-02-01 15:20:20.909049794 +0000 +@@ -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=LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt diff --git a/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb b/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb index e36aad6800..c2058fb715 100644 --- a/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb +++ b/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb @@ -1,10 +1,11 @@ DESCRIPTION = "A library for atomic integer operations" LICENSE = "MIT" -PR = "r2" +PR = "r4" SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz \ - file://fedora/libatomic_ops-1.2-ppclwzfix.patch;patch=1" + file://fedora/libatomic_ops-1.2-ppclwzfix.patch;patch=1 \ + file://doublefix.patch;patch=1" S = "${WORKDIR}/libatomic_ops-${PV}" -- cgit v1.2.3-54-g00ecf