diff options
Diffstat (limited to 'meta/recipes-support/taglib/taglib-1.6.3/configuretweak.patch')
-rw-r--r-- | meta/recipes-support/taglib/taglib-1.6.3/configuretweak.patch | 73 |
1 files changed, 0 insertions, 73 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 deleted file mode 100644 index 8b81fc7429..0000000000 --- a/meta/recipes-support/taglib/taglib-1.6.3/configuretweak.patch +++ /dev/null | |||
@@ -1,73 +0,0 @@ | |||
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 | Upstream-Status: Inappropriate [configuration] | ||
9 | |||
10 | Index: taglib-1.6.1/acinclude.m4 | ||
11 | =================================================================== | ||
12 | --- taglib-1.6.1.orig/acinclude.m4 2010-02-01 23:57:16.857788731 +0000 | ||
13 | +++ taglib-1.6.1/acinclude.m4 2010-02-01 23:58:08.239039503 +0000 | ||
14 | @@ -3141,12 +3141,7 @@ | ||
15 | [kde_use_profiling="no"] | ||
16 | ) | ||
17 | |||
18 | - dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS | ||
19 | - CFLAGS=" $CFLAGS" | ||
20 | |||
21 | - AC_PROG_CC | ||
22 | - | ||
23 | - AC_PROG_CPP | ||
24 | |||
25 | if test "$GCC" = "yes"; then | ||
26 | if test "$kde_use_debug_code" != "no"; then | ||
27 | @@ -3174,9 +3169,6 @@ | ||
28 | LDFLAGS="" | ||
29 | fi | ||
30 | |||
31 | - CXXFLAGS=" $CXXFLAGS" | ||
32 | - | ||
33 | - AC_PROG_CXX | ||
34 | |||
35 | KDE_CHECK_FOR_BAD_COMPILER | ||
36 | |||
37 | Index: taglib-1.6.1/configure.in | ||
38 | =================================================================== | ||
39 | --- taglib-1.6.1.orig/configure.in 2010-02-01 23:46:47.389039146 +0000 | ||
40 | +++ taglib-1.6.1/configure.in 2010-02-01 23:58:14.317819479 +0000 | ||
41 | @@ -36,6 +36,21 @@ | ||
42 | dnl This ksh/zsh feature conflicts with `cd blah ; pwd` | ||
43 | unset CDPATH | ||
44 | |||
45 | +dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS | ||
46 | +CFLAGS=" $CFLAGS" | ||
47 | + | ||
48 | +AC_PROG_CC | ||
49 | + | ||
50 | +AC_PROG_CPP | ||
51 | + | ||
52 | +CXXFLAGS=" $CXXFLAGS" | ||
53 | + | ||
54 | +AC_PROG_CXX | ||
55 | + | ||
56 | +dnl checks for programs. | ||
57 | +dnl first check for c/c++ compilers | ||
58 | +AC_CHECK_COMPILERS | ||
59 | + | ||
60 | dnl Checking host/target/build systems, for make, install etc. | ||
61 | AC_CANONICAL_SYSTEM | ||
62 | dnl Perform program name transformation | ||
63 | @@ -62,9 +77,7 @@ | ||
64 | AM_CONFIG_HEADER(config.h) | ||
65 | AM_CONFIG_HEADER(taglib/taglib_config.h) | ||
66 | |||
67 | -dnl checks for programs. | ||
68 | -dnl first check for c/c++ compilers | ||
69 | -AC_CHECK_COMPILERS | ||
70 | + | ||
71 | |||
72 | dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__ | ||
73 | dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__ | ||