File otp_src_18.3.1-otp_build.patch of Package erlang
diff -Ndur otp_src_18.3.1/make/lazy_configure.mk otp_src_18.3.1-otp_build/make/lazy_configure.mk
--- otp_src_18.3.1/make/lazy_configure.mk 2016-04-01 21:19:13.000000000 +0300
+++ otp_src_18.3.1-otp_build/make/lazy_configure.mk 2016-04-07 00:12:04.281224279 +0300
@@ -18,7 +18,7 @@
#
ifndef EXPECTED_AUTOCONF_VERSION
-EXPECTED_AUTOCONF_VERSION=2.59
+EXPECTED_AUTOCONF_VERSION=2.[56][0-9]
endif
SAVE_ARGS=$(ERL_TOP)/make/save_args
CONFIG_STATUS=$(CONFIGURE_DIR)/$(TARGET)/config.status
@@ -40,7 +40,7 @@
$(CONFIGURE_DIR)/configure: $(CONFIGURE_DIR)/configure.in $(EXTRA_CONFIGURE_DEPENDENCIES)
rm -f $(CONFIG_CACHE_FILE)
- @ exp_ac_vsn=$(EXPECTED_AUTOCONF_VERSION) ; \
+ @ exp_ac_vsn="$(EXPECTED_AUTOCONF_VERSION)"; \
ac_vsn_blob=`autoconf --version` ; \
ac_vsn=`echo x$$ac_vsn_blob | sed "s|[^0-9]*\([0-9][^ \t\n]*\).*|\1|"` ; \
case "$$ac_vsn" in \
diff -Ndur otp_src_18.3.1/otp_build otp_src_18.3.1-otp_build/otp_build
--- otp_src_18.3.1/otp_build 2016-04-01 21:19:13.000000000 +0300
+++ otp_src_18.3.1-otp_build/otp_build 2016-04-07 00:13:04.540230822 +0300
@@ -20,7 +20,7 @@
#
# Expected autoconf version
-EXPECTED_AUTOCONF_VERSION=2.59
+EXPECTED_AUTOCONF_VERSION="2.[56][0-9]"
# Global configuration variables
#
@@ -294,7 +294,7 @@
WANT_AUTOCONF_VER=$EXPECTED_AUTOCONF_VERSION
export WANT_AUTOCONF_VER
fi
- exp_ac_vsn=$EXPECTED_AUTOCONF_VERSION
+ exp_ac_vsn="$EXPECTED_AUTOCONF_VERSION"
ac_vsn_blob=`autoconf --version`
ac_vsn=`echo x$ac_vsn_blob | sed "s|[^0-9]*\([0-9][^ \t\n]*\).*|\1|"`
case "$ac_vsn" in
@@ -583,7 +583,7 @@
CONFIGURE_DIR=$dir \
EXTRA_CONFIGURE_DEPENDENCIES=$xc_dep \
EXTRA_CONFIG_STATUS_DEPENDENCIES=$xcs_dep \
- EXPECTED_AUTOCONF_VERSION=$EXPECTED_AUTOCONF_VERSION \
+ EXPECTED_AUTOCONF_VERSION="$EXPECTED_AUTOCONF_VERSION" \
lazy_configure
echo "=== Done configuring $dir"
echo ""
@@ -613,7 +613,7 @@
MAKE="$MAKE" TARGET=$TARGET \
ERL_TOP=$ERL_TOP \
CONFIGURE_DIR=$dir \
- EXPECTED_AUTOCONF_VERSION=$EXPECTED_AUTOCONF_VERSION \
+ EXPECTED_AUTOCONF_VERSION="$EXPECTED_AUTOCONF_VERSION" \
lazy_configure_clean
echo "=== Done cleaning configure in $dir"
echo ""
@@ -644,7 +644,7 @@
MAKE="$MAKE" TARGET=$TARGET \
ERL_TOP=$ERL_TOP \
CONFIGURE_DIR=$dir \
- EXPECTED_AUTOCONF_VERSION=$EXPECTED_AUTOCONF_VERSION \
+ EXPECTED_AUTOCONF_VERSION="$EXPECTED_AUTOCONF_VERSION" \
lazy_configure_target_clean
echo "=== Done target cleaning configure in $dir"
echo ""