diff options
Diffstat (limited to 'package/autoconf')
| -rw-r--r-- | package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch | 36 | ||||
| -rw-r--r-- | package/autoconf/autoconf.mk | 53 |
2 files changed, 43 insertions, 46 deletions
diff --git a/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch b/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch new file mode 100644 index 000000000..35f99b2fd --- /dev/null +++ b/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch @@ -0,0 +1,36 @@ +Patch taken upstream at +http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=7f75858f577f11a844781764f30cd42cfe8a5669, +with the following modifications: + + * Changes to NEWS file removed to avoid conflicts + + * Changes also made manually to the generated configure + script. Otherwise, host-autoconf is needed to compile + host-autoconf ! + +Index: autoconf-2.65.old/configure +=================================================================== +--- autoconf-2.65.old.orig/configure 2009-12-15 16:11:05.175566911 +0100 ++++ autoconf-2.65.old/configure 2009-12-15 16:11:37.739562146 +0100 +@@ -2380,7 +2380,7 @@ + ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)' + ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl + test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \ +- && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \ ++ && test -z "`$as_echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \ + && test -f conftest.m4f \ + && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=: + rm -f conftest.m4f +Index: autoconf-2.65.old/m4/m4.m4 +=================================================================== +--- autoconf-2.65.old.orig/m4/m4.m4 2009-12-15 16:11:05.207566124 +0100 ++++ autoconf-2.65.old/m4/m4.m4 2009-12-15 16:11:18.595562030 +0100 +@@ -29,7 +29,7 @@ + ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)' + ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl + test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \ +- && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \ ++ && test -z "`AS_ECHO([$ac_snippet]) | $ac_path_M4 --trace=mac 2>&1`" \ + && test -f conftest.m4f \ + && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=: + rm -f conftest.m4f], diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index 931d551f5..d82c2c5c7 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -3,7 +3,7 @@ # autoconf # ############################################################# -AUTOCONF_VERSION = 2.64 +AUTOCONF_VERSION = 2.65 AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.bz2 AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf @@ -16,53 +16,14 @@ AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \ AUTOCONF_DEPENDENCIES = microperl host-m4 -$(eval $(call AUTOTARGETS,package,autoconf)) +HOST_AUTOCONF_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \ + ac_cv_prog_gnu_m4_gnu=no + +HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool -# autoconf for the host -AUTOCONF_HOST_DIR:=$(BUILD_DIR)/autoconf-$(AUTOCONF_VERSION)-host +$(eval $(call AUTOTARGETS,package,autoconf)) +$(eval $(call AUTOTARGETS,package,autoconf,host)) # variables used by other packages AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" $(HOST_DIR)/usr/bin/autoreconf -v -f -i -I "$(ACLOCAL_DIR)" - -$(DL_DIR)/$(AUTOCONF_SOURCE): - $(call DOWNLOAD,$(AUTOCONF_SITE),$(AUTOCONF_SOURCE)) - -$(STAMP_DIR)/host_autoconf_unpacked: $(DL_DIR)/$(AUTOCONF_SOURCE) - mkdir -p $(AUTOCONF_HOST_DIR) - $(INFLATE$(suffix $(AUTOCONF_SOURCE))) $< | \ - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(AUTOCONF_HOST_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(AUTOCONF_HOST_DIR) package/autoconf/ \*.patch - touch $@ - -$(STAMP_DIR)/host_autoconf_configured: $(STAMP_DIR)/host_autoconf_unpacked $(STAMP_DIR)/host_m4_installed $(STAMP_DIR)/host_libtool_installed - (cd $(AUTOCONF_HOST_DIR); rm -rf config.cache; \ - $(HOST_CONFIGURE_OPTS) \ - CFLAGS="$(HOST_CFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS)" \ - ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \ - ac_cv_prog_gnu_m4_gnu=no \ - ./configure $(QUIET) \ - --prefix="$(HOST_DIR)/usr" \ - --sysconfdir="$(HOST_DIR)/etc" \ - --disable-static \ - ) - touch $@ - -$(STAMP_DIR)/host_autoconf_compiled: $(STAMP_DIR)/host_autoconf_configured - $(MAKE) -C $(AUTOCONF_HOST_DIR) - touch $@ - -$(STAMP_DIR)/host_autoconf_installed: $(STAMP_DIR)/host_autoconf_compiled - $(MAKE) -C $(AUTOCONF_HOST_DIR) install - touch $@ - -host-autoconf: $(STAMP_DIR)/host_autoconf_installed - -host-autoconf-clean: - rm -f $(addprefix $(STAMP_DIR)/host_autoconf_,unpacked configured compiled installed) - -$(MAKE) -C $(AUTOCONF_HOST_DIR) uninstall - -$(MAKE) -C $(AUTOCONF_HOST_DIR) clean - -host-autoconf-dirclean: - rm -rf $(AUTOCONF_HOST_DIR) |