1 files changed, 71 insertions, 0 deletions
diff --git a/meta/recipes-support/taglib/taglib-1.6.3/configuretweak.patch b/meta/recipes-support/taglib/taglib-1.6.3/configuretweak.patch
new file mode 100644
index 0000000000..07eb6d754c
--- /dev/null
+++ b/meta/recipes-support/taglib/taglib-1.6.3/configuretweak.patch
@@ -0,0 +1,71 @@
+New autoconf gets upset if AC_PROC_CC and friends aren't called at
+the top level (see http://www.gnu.org/software/hello/manual/autoconf/Expanded-Before-Required.html)
+Fix macros accordingly fixing build failures
+RP 2/2/10
+Index: taglib-1.6.1/acinclude.m4
+===================================================================
+--- taglib-1.6.1.orig/acinclude.m4      2010-02-01 23:57:16.857788731 +0000
+++ taglib-1.6.1/acinclude.m4   2010-02-01 23:58:08.239039503 +0000
+@@ -3141,12 +3141,7 @@
+     [kde_use_profiling="no"]
+   )
+ 
+-  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+-  CFLAGS=" $CFLAGS"
+ 
+-  AC_PROG_CC 
+-
+-  AC_PROG_CPP
+ 
+   if test "$GCC" = "yes"; then
+     if test "$kde_use_debug_code" != "no"; then
+@@ -3174,9 +3169,6 @@
+      LDFLAGS=""
+   fi
+ 
+-  CXXFLAGS=" $CXXFLAGS"
+-
+-  AC_PROG_CXX
+ 
+   KDE_CHECK_FOR_BAD_COMPILER
+ 
+Index: taglib-1.6.1/configure.in
+===================================================================
+--- taglib-1.6.1.orig/configure.in      2010-02-01 23:46:47.389039146 +0000
+++ taglib-1.6.1/configure.in   2010-02-01 23:58:14.317819479 +0000
+@@ -36,6 +36,21 @@
+ dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
+ unset CDPATH
+ 
+dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+CFLAGS=" $CFLAGS"
+
+AC_PROG_CC 
+
+AC_PROG_CPP
+
+CXXFLAGS=" $CXXFLAGS"
+
+AC_PROG_CXX
+
+dnl checks for programs.
+dnl first check for c/c++ compilers
+AC_CHECK_COMPILERS
+
+ dnl Checking host/target/build systems, for make, install etc.
+ AC_CANONICAL_SYSTEM
+ dnl Perform program name transformation
+@@ -62,9 +77,7 @@
+ AM_CONFIG_HEADER(config.h)
+ AM_CONFIG_HEADER(taglib/taglib_config.h)
+ 
+-dnl checks for programs.
+-dnl first check for c/c++ compilers
+-AC_CHECK_COMPILERS
+
+ 
+ dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
+ dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__

diff --git a/meta/recipes-support/taglib/taglib-1.6.3/configuretweak.patch b/meta/recipes-support/taglib/taglib-1.6.3/configuretweak.patch new file mode 100644 index 0000000000..07eb6d754c --- /dev/null +++ b/meta/recipes-support/taglib/taglib-1.6.3/configuretweak.patch
@@ -0,0 +1,71 @@
	1	New autoconf gets upset if AC_PROC_CC and friends aren't called at
	2	the top level (see http://www.gnu.org/software/hello/manual/autoconf/Expanded-Before-Required.html)
	3
	4	Fix macros accordingly fixing build failures
	5
	6	RP 2/2/10
	7
	8	Index: taglib-1.6.1/acinclude.m4
	9	===================================================================
	10	--- taglib-1.6.1.orig/acinclude.m4 2010-02-01 23:57:16.857788731 +0000
	11	+++ taglib-1.6.1/acinclude.m4 2010-02-01 23:58:08.239039503 +0000
	12	@@ -3141,12 +3141,7 @@
	13	[kde_use_profiling="no"]
	14	)
	15
	16	- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
	17	- CFLAGS=" $CFLAGS"
	18
	19	- AC_PROG_CC
	20	-
	21	- AC_PROG_CPP
	22
	23	if test "$GCC" = "yes"; then
	24	if test "$kde_use_debug_code" != "no"; then
	25	@@ -3174,9 +3169,6 @@
	26	LDFLAGS=""
	27	fi
	28
	29	- CXXFLAGS=" $CXXFLAGS"
	30	-
	31	- AC_PROG_CXX
	32
	33	KDE_CHECK_FOR_BAD_COMPILER
	34
	35	Index: taglib-1.6.1/configure.in
	36	===================================================================
	37	--- taglib-1.6.1.orig/configure.in 2010-02-01 23:46:47.389039146 +0000
	38	+++ taglib-1.6.1/configure.in 2010-02-01 23:58:14.317819479 +0000
	39	@@ -36,6 +36,21 @@
	40	dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
	41	unset CDPATH
	42
	43	+dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
	44	+CFLAGS=" $CFLAGS"
	45	+
	46	+AC_PROG_CC
	47	+
	48	+AC_PROG_CPP
	49	+
	50	+CXXFLAGS=" $CXXFLAGS"
	51	+
	52	+AC_PROG_CXX
	53	+
	54	+dnl checks for programs.
	55	+dnl first check for c/c++ compilers
	56	+AC_CHECK_COMPILERS
	57	+
	58	dnl Checking host/target/build systems, for make, install etc.
	59	AC_CANONICAL_SYSTEM
	60	dnl Perform program name transformation
	61	@@ -62,9 +77,7 @@
	62	AM_CONFIG_HEADER(config.h)
	63	AM_CONFIG_HEADER(taglib/taglib_config.h)
	64
	65	-dnl checks for programs.
	66	-dnl first check for c/c++ compilers
	67	-AC_CHECK_COMPILERS
	68	+
	69
	70	dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
	71	dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__