update code
This commit is contained in:
commit
6d5c8a5a2c
25
0001-Fix-test-suite-with-modern-Perl.patch
Normal file
25
0001-Fix-test-suite-with-modern-Perl.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From dfb0659b205e03af62542cd318a9f3253e28c40a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Daniel Colascione <dancol@dancol.org>
|
||||||
|
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
|
||||||
|
|
||||||
25
0001-skip-one-test-at-line-1616-of-autotest.patch
Normal file
25
0001-skip-one-test-at-line-1616-of-autotest.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From d166f156529667302b7055393c067aeedef28e6c Mon Sep 17 00:00:00 2001
|
||||||
|
From: shenyangyang4 <shenyangyang4@huawei.com>
|
||||||
|
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
|
||||||
|
|
||||||
28
autoconf-2.69-perl-5.22-autoscan.patch
Normal file
28
autoconf-2.69-perl-5.22-autoscan.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From e5654a5591884b92633c7785f325626711e7f7aa Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||||
|
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
|
||||||
|
<http://lists.gnu.org/archive/html/bug-autoconf/2013-01/msg00059.html>.
|
||||||
|
---
|
||||||
|
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
|
||||||
|
|
||||||
BIN
autoconf-2.69.tar.xz
Normal file
BIN
autoconf-2.69.tar.xz
Normal file
Binary file not shown.
16
autoconf-init.el
Normal file
16
autoconf-init.el
Normal file
@ -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))
|
||||||
79
autoconf.spec
Normal file
79
autoconf.spec
Normal file
@ -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 <buildteam@openeuler.org> - 2.69-29
|
||||||
|
- Package Init
|
||||||
22
config.site
Normal file
22
config.site
Normal file
@ -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
|
||||||
Loading…
x
Reference in New Issue
Block a user