diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-03-26 09:35:40 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-03-26 11:01:18 +0100 |
| commit | d775a0d83ea4b322fcc606d6ccde67825869ce3d (patch) | |
| tree | bbfb3028cb72d87e0c89aa923a157a33ea06b39d /recipes/pulseaudio | |
| parent | 35c50ca5d1ba2effc263584b3cd1e8eb06ec4578 (diff) | |
libatomics-ops: add patch avoiding installing 2 header files twice
* automake-1.11 is checking that and fails
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/pulseaudio')
| -rw-r--r-- | recipes/pulseaudio/libatomics-ops/dont.install.header.twice.patch | 19 | ||||
| -rw-r--r-- | recipes/pulseaudio/libatomics-ops_1.2.bb | 5 |
2 files changed, 22 insertions, 2 deletions
diff --git a/recipes/pulseaudio/libatomics-ops/dont.install.header.twice.patch b/recipes/pulseaudio/libatomics-ops/dont.install.header.twice.patch new file mode 100644 index 0000000000..58848106a7 --- /dev/null +++ b/recipes/pulseaudio/libatomics-ops/dont.install.header.twice.patch @@ -0,0 +1,19 @@ +diff -uNr libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am libatomic_ops-1.2.new/src/atomic_ops/sysdeps/Makefile.am +--- libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am 2010-03-26 09:30:32.000000000 +0100 ++++ libatomic_ops-1.2.new/src/atomic_ops/sysdeps/Makefile.am 2010-03-26 09:34:13.000000000 +0100 +@@ -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 -uNr libatomic_ops-1.2/doc/Makefile.am libatomic_ops-1.2.new/doc/Makefile.am +--- libatomic_ops-1.2/doc/Makefile.am 2005-03-21 23:05:19.000000000 +0100 ++++ libatomic_ops-1.2.new/doc/Makefile.am 2010-03-26 09:38:18.000000000 +0100 +@@ -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 --git a/recipes/pulseaudio/libatomics-ops_1.2.bb b/recipes/pulseaudio/libatomics-ops_1.2.bb index 94949c51b5..d0c298a823 100644 --- a/recipes/pulseaudio/libatomics-ops_1.2.bb +++ b/recipes/pulseaudio/libatomics-ops_1.2.bb @@ -1,11 +1,12 @@ DESCRIPTION = "A library for atomic integer operations" LICENSE = "MIT" -PR = "r2" +PR = "r3" 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://gentoo/libatomic_ops-1.2-mips.patch;patch=1" + file://gentoo/libatomic_ops-1.2-mips.patch;patch=1 \ + file://dont.install.header.twice.patch;patch=1" S = "${WORKDIR}/libatomic_ops-${PV}" |