From: Marko Lindqvist <cazfi74@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH v2 01/15] pkg-config: replace obsolete automake macros with working ones
Date: Mon, 7 Jan 2013 01:49:27 +0200 [thread overview]
Message-ID: <1357516181-5358-2-git-send-email-cazfi74@gmail.com> (raw)
In-Reply-To: <1357516181-5358-1-git-send-email-cazfi74@gmail.com>
Add obsolete-automake-macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
.../pkgconfig-0.25/obsolete_automake_macros.patch | 35 ++++++++++++++++++++
meta/recipes-devtools/pkgconfig/pkgconfig.inc | 4 ++-
meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb | 2 +-
3 files changed, 39 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch
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 0000000..ce10a5e
--- /dev/null
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.25/obsolete_automake_macros.patch
@@ -0,0 +1,35 @@
+Upstream-Status: Fixed
+
+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
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index c54e325..a2d4700 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -15,7 +15,9 @@ DEPENDS_class-nativesdk = ""
SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
file://autofoo.patch \
file://glibconfig-sysdefs.h \
- file://disable-legacy.patch"
+ file://disable-legacy.patch \
+ file://obsolete_automake_macros.patch \
+"
S = "${WORKDIR}/pkg-config-${PV}/"
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
index d0a2b1f..a269973 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
@@ -1,6 +1,6 @@
require pkgconfig.inc
-PR = "r6"
+PR = "r7"
SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745"
SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e"
--
1.7.10.4
next prev parent reply other threads:[~2013-01-07 0:05 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-06 23:49 Prepare recipes for automake-1.13 (batch 1 / v2) Marko Lindqvist
2013-01-06 23:49 ` Marko Lindqvist [this message]
2013-01-06 23:49 ` [PATCH v2 02/15] libtool: remove help2man dependency Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 03/15] bison: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 04/15] file: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 05/15] popt: disable tests Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 06/15] glib-2.0: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 07/15] libx11: disable tests Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 08/15] libpng: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 09/15] libusb: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 10/15] pixman: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 11/15] libid3tag: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 12/15] libgcrypt: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 13/15] gnutls: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 14/15] libtasn1: remove help2man dependency Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 15/15] flac: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-07 11:59 ` [PATCH v2 04/15] file: " Richard Purdie
2013-01-07 12:11 ` Marko Lindqvist
2013-01-07 12:16 ` Burton, Ross
2013-01-07 12:18 ` Otavio Salvador
2013-01-07 13:46 ` Richard Purdie
2013-01-07 15:58 ` Otavio Salvador
2013-01-07 16:26 ` Marko Lindqvist
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357516181-5358-2-git-send-email-cazfi74@gmail.com \
--to=cazfi74@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox