sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Marko Lindqvist 2013-01-08 09:16:33 +02:00 committed by Richard Purdie
parent b03b351304
commit 6bd2fb8716
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch Normal file
View File

@ -0,0 +1,35 @@
Upstream-Status: Backport [fixed in 0.27]
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
diff -Nurd pkg-config-0.25/configure.in pkg-config-0.25/configure.in
--- pkg-config-0.25/configure.in 2010-05-28 18:55:09.000000000 +0300
+++ pkg-config-0.25/configure.in 2013-01-01 22:13:47.009573426 +0200
@@ -4,7 +4,7 @@
AM_INIT_AUTOMAKE(pkg-config, 0.25)
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AM_PROG_LIBTOOL
diff -Nurd pkg-config-0.25/glib-1.2.10/configure.in pkg-config-0.25/glib-1.2.10/configure.in
--- pkg-config-0.25/glib-1.2.10/configure.in 2009-12-06 22:43:59.000000000 +0200
+++ pkg-config-0.25/glib-1.2.10/configure.in 2013-01-01 22:23:36.701560486 +0200
@@ -63,7 +63,7 @@
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
# Specify a configuration file
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION)
AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION)
@@ -154,7 +154,6 @@
# Checks for programs.
AC_PROG_CC
-AM_PROG_CC_STDC
AC_PROG_INSTALL
changequote(,)dnl

4
meta/recipes-devtools/pkgconfig/pkgconfig.inc
View File

@ -16,7 +16,9 @@ SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
file://autofoo.patch \
file://glibconfig-sysdefs.h \
file://pkg-config-native.in \
file://disable-legacy.patch"
file://disable-legacy.patch \
file://obsolete_automake_macros.patch \
"
S = "${WORKDIR}/pkg-config-${PV}/"

2
meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
View File

@ -1,6 +1,6 @@
require pkgconfig.inc
PR = "r6"
PR = "r7"
SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745"
SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e"