summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-23 18:29:29 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-23 18:36:20 (GMT)
commit6c77a0f0fa0c97bfbe93f4a930a1549566a7f016 (patch)
tree48269c40a4f03d417ad68164413fb40129f9e81a /meta/recipes-support
parentac56e2ed37d592f9af84a14074367b7d137818f8 (diff)
downloadpoky-6c77a0f0fa0c97bfbe93f4a930a1549566a7f016.tar.gz
taglib: Refresh patch after recent accidental breakage
(From OE-Core rev: 7ad7c837bac0cd086098be0d7cdf5cd8388a8696) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/taglib/taglib-1.6.3/nolibtool.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-support/taglib/taglib-1.6.3/nolibtool.patch b/meta/recipes-support/taglib/taglib-1.6.3/nolibtool.patch
index bf45b2f..73b0988 100644
--- a/meta/recipes-support/taglib/taglib-1.6.3/nolibtool.patch
+++ b/meta/recipes-support/taglib/taglib-1.6.3/nolibtool.patch
@@ -1,10 +1,10 @@
1Upstream-Status: Inappropriate [configuration] 1Upstream-Status: Inappropriate [configuration]
2 2
3Index: taglib-1.6.1/acinclude.m4 3Index: taglib-1.6.3/acinclude.m4
4=================================================================== 4===================================================================
5--- taglib-1.6.1.orig/acinclude.m4 2009-10-31 10:04:35.000000000 +0000 5--- taglib-1.6.3.orig/acinclude.m4 2012-03-23 18:27:53.641984582 +0000
6+++ taglib-1.6.1/acinclude.m4 2010-02-01 15:25:38.887788993 +0000 6+++ taglib-1.6.3/acinclude.m4 2012-03-23 18:28:05.601985381 +0000
7@@ -5997,5894 +5997,3 @@ 7@@ -5989,5894 +5989,3 @@
8 KDE_USE_PIE="-pie" 8 KDE_USE_PIE="-pie"
9 fi 9 fi
10 ]) 10 ])
@@ -1027,7 +1027,7 @@ Index: taglib-1.6.1/acinclude.m4
1027- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ 1027- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
1028- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then 1028- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
1029- 1029-
1030- # We can hardcode non-existent directories. 1030- # We can hardcode non-existant directories.
1031- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && 1031- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
1032- # If the only mechanism to avoid hardcoding is shlibpath_var, we 1032- # If the only mechanism to avoid hardcoding is shlibpath_var, we
1033- # have to relink, otherwise we might link with an installed library 1033- # have to relink, otherwise we might link with an installed library
@@ -5899,10 +5899,10 @@ Index: taglib-1.6.1/acinclude.m4
5899-SED=$lt_cv_path_SED 5899-SED=$lt_cv_path_SED
5900-AC_MSG_RESULT([$SED]) 5900-AC_MSG_RESULT([$SED])
5901-]) 5901-])
5902Index: taglib-1.6.1/Makefile.am 5902Index: taglib-1.6.3/Makefile.am
5903=================================================================== 5903===================================================================
5904--- taglib-1.6.1.orig/Makefile.am 2010-02-01 16:47:11.687791360 +0000 5904--- taglib-1.6.3.orig/Makefile.am 2010-04-12 17:43:03.000000000 +0000
5905+++ taglib-1.6.1/Makefile.am 2010-02-01 16:47:33.217875703 +0000 5905+++ taglib-1.6.3/Makefile.am 2012-03-23 18:27:45.665984775 +0000
5906@@ -8,8 +8,8 @@ 5906@@ -8,8 +8,8 @@
5907 $(top_srcdir)/subdirs: 5907 $(top_srcdir)/subdirs:
5908 cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs 5908 cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs