summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-08 09:16:33 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-10 23:43:14 +0000
commit6bd2fb8716380c07d9383ff9466b9c95dd8adc0d (patch)
tree661cf1b8f8a69c16d24f391fd936a462a4bdaafe /meta
parentb03b351304ccb893e84941aaed8cf4d687705aec (diff)
downloadpoky-6bd2fb8716380c07d9383ff9466b9c95dd8adc0d.tar.gz
pkg-config: replace obsolete automake macros with working ones
Add obsolete_automake_macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. (From OE-Core rev: 4b0adc3b55fe8541d39e529485a5adce747e77e0) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch35
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig.inc4
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb2
3 files changed, 39 insertions, 2 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..b6e7f62d4d
--- /dev/null
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch
@@ -0,0 +1,35 @@
1Upstream-Status: Backport [fixed in 0.27]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd pkg-config-0.25/configure.in pkg-config-0.25/configure.in
5--- pkg-config-0.25/configure.in 2010-05-28 18:55:09.000000000 +0300
6+++ pkg-config-0.25/configure.in 2013-01-01 22:13:47.009573426 +0200
7@@ -4,7 +4,7 @@
8 AM_INIT_AUTOMAKE(pkg-config, 0.25)
9 AM_MAINTAINER_MODE
10
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13
14 AM_PROG_LIBTOOL
15
16diff -Nurd pkg-config-0.25/glib-1.2.10/configure.in pkg-config-0.25/glib-1.2.10/configure.in
17--- pkg-config-0.25/glib-1.2.10/configure.in 2009-12-06 22:43:59.000000000 +0200
18+++ pkg-config-0.25/glib-1.2.10/configure.in 2013-01-01 22:23:36.701560486 +0200
19@@ -63,7 +63,7 @@
20 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
21
22 # Specify a configuration file
23-AM_CONFIG_HEADER(config.h)
24+AC_CONFIG_HEADERS(config.h)
25
26 AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION)
27 AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION)
28@@ -154,7 +154,6 @@
29
30 # Checks for programs.
31 AC_PROG_CC
32-AM_PROG_CC_STDC
33 AC_PROG_INSTALL
34
35 changequote(,)dnl
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index c4fa456e92..87d7165175 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -16,7 +16,9 @@ SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
16 file://autofoo.patch \ 16 file://autofoo.patch \
17 file://glibconfig-sysdefs.h \ 17 file://glibconfig-sysdefs.h \
18 file://pkg-config-native.in \ 18 file://pkg-config-native.in \
19 file://disable-legacy.patch" 19 file://disable-legacy.patch \
20 file://obsolete_automake_macros.patch \
21 "
20 22
21S = "${WORKDIR}/pkg-config-${PV}/" 23S = "${WORKDIR}/pkg-config-${PV}/"
22 24
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
index d0a2b1f9e5..a269973c1d 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
@@ -1,6 +1,6 @@
1require pkgconfig.inc 1require pkgconfig.inc
2 2
3PR = "r6" 3PR = "r7"
4 4
5SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745" 5SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745"
6SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e" 6SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e"