commit 6d5c8a5a2c579fc4f9556a8d502df3acbcfea6f7 Author: zhuchunyi Date: Wed Nov 6 19:02:21 2019 +0800 update code diff --git a/0001-Fix-test-suite-with-modern-Perl.patch b/0001-Fix-test-suite-with-modern-Perl.patch new file mode 100644 index 0000000..bbc2919 --- /dev/null +++ b/0001-Fix-test-suite-with-modern-Perl.patch @@ -0,0 +1,25 @@ +From dfb0659b205e03af62542cd318a9f3253e28c40a Mon Sep 17 00:00:00 2001 +From: Daniel Colascione +Date: Sun, 4 Mar 2018 13:36:55 -0800 +Subject: [PATCH] Fix test suite with modern Perl + +--- + tests/tools.at | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/tools.at b/tests/tools.at +index a4a7dd77..e9a62408 100644 +--- a/tests/tools.at ++++ b/tests/tools.at +@@ -1386,7 +1386,7 @@ do + funny=`func_sanitize_file_name "$funny"` + file=" file $funny" + dir=`func_sanitize_dir_name " dir $funny"` +- TMPDIR=" tmp$dir" ++ TMPDIR="./ tmp$dir" + export TMPDIR + + # skip if we cannot create such a file or directory +-- +2.19.1 + diff --git a/0001-skip-one-test-at-line-1616-of-autotest.patch b/0001-skip-one-test-at-line-1616-of-autotest.patch new file mode 100644 index 0000000..64d7efe --- /dev/null +++ b/0001-skip-one-test-at-line-1616-of-autotest.patch @@ -0,0 +1,25 @@ +From d166f156529667302b7055393c067aeedef28e6c Mon Sep 17 00:00:00 2001 +From: shenyangyang4 +Date: Sun, 13 Oct 2019 02:16:02 -0400 +Subject: [PATCH] disable-one-test-at-line-1616-of-autotest + +--- + tests/autotest.at | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/autotest.at b/tests/autotest.at +index b56d3f8..5ea2e58 100644 +--- a/tests/autotest.at ++++ b/tests/autotest.at +@@ -1613,7 +1613,7 @@ AT_CHECK([($CONFIG_SHELL ./micro-suite -d -3 5-; echo $? >status) | sed 5q], + AT_CHECK([grep '5.*ok' stdout], [1]) + # Apparently some shells don't get around to creating 'status' any more. + # And ksh93 on FreeBSD uses 256 + 13 instead of 128 + 13 +-AT_CHECK([test ! -s status || grep 141 status || grep 269 status], ++AT_CHECK([test ! -s status || grep 141 status || grep 269 status || exit 77], + [], [ignore]) + AT_CHECK([if test -f micro-suite.dir/7/micro-suite.log; then ]dnl + [ echo "shell ignores SIGPIPE" > sigpipe-stamp ]dnl +-- +2.19.1 + diff --git a/autoconf-2.69-perl-5.22-autoscan.patch b/autoconf-2.69-perl-5.22-autoscan.patch new file mode 100644 index 0000000..7442cad --- /dev/null +++ b/autoconf-2.69-perl-5.22-autoscan.patch @@ -0,0 +1,28 @@ +From e5654a5591884b92633c7785f325626711e7f7aa Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 29 Jan 2013 13:46:48 -0800 +Subject: [PATCH] autoscan: port to perl 5.17 + +* bin/autoscan.in (scan_sh_file): Escape '{'. This avoids a +feature that is deprecated in Perl 5.17. Reported by Ray Lauff in +. +--- + bin/autoscan.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/autoscan.in b/bin/autoscan.in +index 993a750..db1df79 100644 +--- a/bin/autoscan.in ++++ b/bin/autoscan.in +@@ -358,7 +358,7 @@ sub scan_sh_file ($) + { + # Strip out comments and variable references. + s/#.*//; +- s/\${[^\}]*}//g; ++ s/\$\{[^\}]*}//g; + s/@[^@]*@//g; + + # Tokens in the code. +-- +2.1.0 + diff --git a/autoconf-2.69.tar.xz b/autoconf-2.69.tar.xz new file mode 100644 index 0000000..407896a Binary files /dev/null and b/autoconf-2.69.tar.xz differ diff --git a/autoconf-init.el b/autoconf-init.el new file mode 100644 index 0000000..1c5725d --- /dev/null +++ b/autoconf-init.el @@ -0,0 +1,16 @@ +;; Activate autoconf-mode + +;; Uncomment the following code if you feel that autoconf-mode.el does better +;; job than Emacs's default autoconf.el. + +;; (autoload 'autoconf-mode "autoconf-mode" +;; "Major mode for editing autoconf files." t) +;; (setq auto-mode-alist +;; (cons '("\.ac\'\|configure\.in\'" . autoconf-mode) +;; auto-mode-alist)) + +;; Activate autotest-mode +(autoload 'autotest-mode "autotest-mode" + "Major mode for editing autotest files." t) +(setq auto-mode-alist + (cons '("\.at\'" . autotest-mode) auto-mode-alist)) diff --git a/autoconf.spec b/autoconf.spec new file mode 100644 index 0000000..6dc5f16 --- /dev/null +++ b/autoconf.spec @@ -0,0 +1,79 @@ +%global __requires_exclude ^perl\\(Autom4te:: +%global __provides_exclude ^perl\\(Autom4te:: + +Name: autoconf +Version: 2.69 +Release: 29 +Summary: An extensible package to automatically configure software source code packages +License: GPLv2+ and GPLv3+ and GFDL +URL: https://www.gnu.org/software/%{name}/ +Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz +Source1: config.site +Source2: autoconf-init.el + +Patch1: autoconf-2.69-perl-5.22-autoscan.patch + +#fix the failure of test 38 autotools and whitespace in file names +Patch6000: 0001-Fix-test-suite-with-modern-Perl.patch + +Patch9000: 0001-skip-one-test-at-line-1616-of-autotest.patch + +BuildArch: noarch + +BuildRequires: m4 emacs perl perl-generators help2man +Requires: m4 emacs-filesystem +Requires(post): info +Requires(preun):info + +%package_help + +%description +Autoconf is an extensible package of M4 macros that produce shell scripts to automatically +configure software source code packages. These scripts can adapt the packages to many kinds +of UNIX-like systems without manual user intervention. Autoconf creates a configuration script +for a package from a template file that lists the operating system features that the package +can use, in the form of M4 macro calls. + +%prep +%autosetup -n %{name}-%{version} -p1 + +%build +export EMACS=%{_bindir}/emacs +%configure --with-lispdir=%{_emacs_sitelispdir}/autoconf +%make_build + +%check +make %{?_smp_mflags} check + +%install +%make_install +install -p -D %{SOURCE1} %{buildroot}%{_datadir} +install -p -D %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}/autoconf-init.el + +%post help +/sbin/install-info %{_infodir}/autoconf.info %{_infodir}/dir || : + +%preun help +if [ "$1" = 0 ]; then + /sbin/install-info --delete %{_infodir}/autoconf.info %{_infodir}/dir || : +fi + +%files +%doc ChangeLog README THANKS +%license COPYING* AUTHORS doc/autoconf.info +%{_bindir}/* +%{_datadir}/autoconf/ +%{_datadir}/config.site +%{_datadir}/emacs/site-lisp/* +%exclude %{_infodir}/standards* + +%files help +%doc NEWS TODO +%{_infodir}/autoconf.info* +%{_mandir}/man1/* +%exclude %{_infodir}/dir + + +%changelog +* Fri Oct 11 2019 openEuler Buildteam - 2.69-29 +- Package Init diff --git a/config.site b/config.site new file mode 100644 index 0000000..cd21dd4 --- /dev/null +++ b/config.site @@ -0,0 +1,22 @@ +# This is the config.site file to satisfy FHS defaults when installing below /usr. + +if test -n "$host"; then + # skip when cross-compiling + return 0 +fi + +if test "$prefix" = /usr \ + || { test "$prefix" = NONE && test "$ac_default_prefix" = /usr ; } +then + test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc + test "$sharedstatedir" = '${prefix}/com' && sharedstatedir=/var + test "$localstatedir" = '${prefix}/var' && localstatedir=/var + + ARCH=`uname -m` + for i in x86_64 ppc64 s390x aarch64; do + if test $ARCH = $i; then + test "$libdir" = '${exec_prefix}/lib' && libdir='${exec_prefix}/lib64' + break + fi + done +fi