m4-native: Fix building on Ubuntu 9.10

Avoid making GNUmakefile a symlink to itself with some versions
of autoconf/automake

Signed-off-by: Esben Haabendal <eha@doredevelopment.dk>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Esben Haabendal 2009-11-10 13:20:59 +01:00 committed by Richard Purdie
parent 2dddd57e63
commit 23a64bce2a
2 changed files with 32 additions and 0 deletions

View File

@ -1,6 +1,10 @@
require m4_${PV}.bb
inherit native
PR = "r1"
SRC_URI_append = " file://ac_config_links.patch;patch=1"
INHIBIT_AUTOTOOLS_DEPS = "1"
DEPENDS += "gnu-config-native"

View File

@ -0,0 +1,28 @@
This patch fixes a build problem for m4-native experienced on Ubuntu 9.10,
where autoconf/automake (AC_CONFIG_LINKS) ends up making GNUmakefile a
symlink to itself.
The patch comments out ac_config_links directly in configure,
as autoreconf is not actually run for m4-native.
I believe it should be safe, as GNUmakefile is actually unpacked from
source, and what we want is to is to not touch it.
Tested on x86_64_linux (Ubuntu 8.04 and 9.10).
2009-11-10 Esben Haabendal <eha@doredevelopment.dk>
diff -urN m4-1.4.13.orig/configure m4-1.4.13/configure
--- m4-1.4.13.orig/configure 2009-11-10 10:54:00.301707097 +0100
+++ m4-1.4.13/configure 2009-11-10 10:54:17.314206379 +0100
@@ -14860,8 +14860,8 @@
# only, it does not matter if we skip the link with older autoconf.
# Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH
# builds, so use a shell variable to bypass this.
- GNUmakefile=GNUmakefile
- ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile"
+ # GNUmakefile=GNUmakefile
+ # ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile"