diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-02 16:21:05 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-02 16:21:05 +0000 |
commit | 18ba0bc495a737f765e4a6da70479ef4ec392d74 (patch) | |
tree | f1fd5fbe6ceb125395ace8eeb676aa5687e1978d /meta-moblin/packages/pulseaudio | |
parent | 625ae518a3bf315686477a1c9f2aaac5c04974f0 (diff) | |
download | poky-18ba0bc495a737f765e4a6da70479ef4ec392d74.tar.gz |
libatomics-ops: Fix with recent autoconf/automake
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-moblin/packages/pulseaudio')
-rw-r--r-- | meta-moblin/packages/pulseaudio/libatomics-ops/doublefix.patch | 25 | ||||
-rw-r--r-- | meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb | 5 |
2 files changed, 28 insertions, 2 deletions
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 @@ | |||
1 | Double path references breaks recent autoconf+automake | ||
2 | |||
3 | RP 2/1/10 | ||
4 | |||
5 | Index: libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am | ||
6 | =================================================================== | ||
7 | --- libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/Makefile.am 2005-09-28 00:53:16.000000000 +0100 | ||
8 | +++ libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am 2010-02-01 14:28:46.397820574 +0000 | ||
9 | @@ -25,7 +25,6 @@ | ||
10 | README \ | ||
11 | \ | ||
12 | gcc/alpha.h gcc/arm.h gcc/x86.h \ | ||
13 | - gcc/hppa.h gcc/ia64.h \ | ||
14 | gcc/powerpc.h gcc/sparc.h \ | ||
15 | gcc/hppa.h gcc/m68k.h gcc/s390.h \ | ||
16 | gcc/ia64.h gcc/x86_64.h gcc/cris.h \ | ||
17 | Index: libatomic_ops-1.2/doc/Makefile.am | ||
18 | =================================================================== | ||
19 | --- libatomic_ops-1.2.orig/doc/Makefile.am 2010-02-01 15:20:09.207788884 +0000 | ||
20 | +++ libatomic_ops-1.2/doc/Makefile.am 2010-02-01 15:20:20.909049794 +0000 | ||
21 | @@ -1,3 +1,3 @@ | ||
22 | # installed documentation | ||
23 | # | ||
24 | -dist_pkgdata_DATA=COPYING LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt | ||
25 | +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 @@ | |||
1 | DESCRIPTION = "A library for atomic integer operations" | 1 | DESCRIPTION = "A library for atomic integer operations" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | 3 | ||
4 | PR = "r2" | 4 | PR = "r4" |
5 | 5 | ||
6 | SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz \ | 6 | SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-1.2.tar.gz \ |
7 | file://fedora/libatomic_ops-1.2-ppclwzfix.patch;patch=1" | 7 | file://fedora/libatomic_ops-1.2-ppclwzfix.patch;patch=1 \ |
8 | file://doublefix.patch;patch=1" | ||
8 | 9 | ||
9 | S = "${WORKDIR}/libatomic_ops-${PV}" | 10 | S = "${WORKDIR}/libatomic_ops-${PV}" |
10 | 11 | ||