diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2010-08-10 19:38:54 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-10-11 15:50:12 +0200 |
| commit | 33ef54d2db26c4789ad9078c6f287b5043a77c4d (patch) | |
| tree | f1baa1a5de66394967edfc1aea1a73f237dceb32 | |
| parent | 8cb8ae6c712b2c98a6e057d56ca0821a9561815b (diff) | |
| download | ptxdist-33ef54d2db26c4789ad9078c6f287b5043a77c4d.tar.gz ptxdist-33ef54d2db26c4789ad9078c6f287b5043a77c4d.tar.xz | |
[host-autotools-autoconf] version bump 2.64 -> 2.67
The new autotools expose a bug in pkg-config, which is also fixed with a
patch backported from pkg-config git in this patch.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/pkg-config-0.25/0001-Add-some-s-before-dnl.patch | 38 | ||||
| -rw-r--r-- | patches/pkg-config-0.25/series | 1 | ||||
| -rw-r--r-- | rules/host-autotools-autoconf.make | 2 |
3 files changed, 40 insertions, 1 deletions
diff --git a/patches/pkg-config-0.25/0001-Add-some-s-before-dnl.patch b/patches/pkg-config-0.25/0001-Add-some-s-before-dnl.patch new file mode 100644 index 000000000..65bc80a89 --- /dev/null +++ b/patches/pkg-config-0.25/0001-Add-some-s-before-dnl.patch @@ -0,0 +1,38 @@ +From 2b86e9b4664fd43622e2cd5ab47713a818758970 Mon Sep 17 00:00:00 2001 +From: Tollef Fog Heen <tfheen@err.no> +Date: Thu, 19 Aug 2010 08:54:09 +0200 +Subject: [PATCH 1/2] Add some []s before dnl + +Autoconf 2.66 has some problems with missing []s before dnls, causing +the expanded text to be garbled. + +Fixes #29056 +--- + pkg.m4 | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pkg.m4 b/pkg.m4 +index 9bb3e06..31169b4 100644 +--- a/pkg.m4 ++++ b/pkg.m4 +@@ -135,7 +135,7 @@ $$1_PKG_ERRORS + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-_PKG_TEXT])dnl ++_PKG_TEXT])[]dnl + ]) + elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) +@@ -146,7 +146,7 @@ path to pkg-config. + + _PKG_TEXT + +-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl ++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl + ]) + else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS +-- +1.7.1 + diff --git a/patches/pkg-config-0.25/series b/patches/pkg-config-0.25/series new file mode 100644 index 000000000..210cfcbf0 --- /dev/null +++ b/patches/pkg-config-0.25/series @@ -0,0 +1 @@ +0001-Add-some-s-before-dnl.patch diff --git a/rules/host-autotools-autoconf.make b/rules/host-autotools-autoconf.make index 20723b044..bad182987 100644 --- a/rules/host-autotools-autoconf.make +++ b/rules/host-autotools-autoconf.make @@ -16,7 +16,7 @@ LAZY_PACKAGES-$(PTXCONF_HOST_AUTOTOOLS_AUTOCONF) += host-autotools-autoconf # # Paths and names # -HOST_AUTOTOOLS_AUTOCONF_VERSION := 2.64 +HOST_AUTOTOOLS_AUTOCONF_VERSION := 2.67 HOST_AUTOTOOLS_AUTOCONF := autoconf-$(HOST_AUTOTOOLS_AUTOCONF_VERSION) HOST_AUTOTOOLS_AUTOCONF_SUFFIX := tar.bz2 HOST_AUTOTOOLS_AUTOCONF_URL := $(PTXCONF_SETUP_GNUMIRROR)/autoconf/$(HOST_AUTOTOOLS_AUTOCONF).$(HOST_AUTOTOOLS_AUTOCONF_SUFFIX) |