Compare commits

..

No commits in common. "04253a10acc2d0f28fa2d7c5c13be19998ea2786" and "dc8b84701ac06be44f4e44ec4496f261ff206d4a" have entirely different histories.

4 changed files with 2 additions and 98 deletions

View File

@ -1,13 +0,0 @@
diff --git a/src/time.c b/src/time.c
index 7e07995..231e8cb 100644
--- a/src/time.c
+++ b/src/time.c
@@ -657,7 +657,7 @@ getargs (argc, argv)
if (format)
output_format = format;
- while ((optc = getopt_long (argc, argv, "+af:o:pqvV", longopts, (int *) 0))
+ while ((optc = getopt_long (argc, argv, "+af:ho:pqvV", longopts, (int *) 0))
!= EOF)
{
switch (optc)

View File

@ -1,65 +0,0 @@
diff -Naur time-1.9.org/config.in time-1.9.sw/config.in
--- time-1.9.org/config.in 2022-02-28 08:27:55.070000000 +0000
+++ time-1.9.sw/config.in 2022-02-28 08:31:36.570000000 +0000
@@ -13,6 +13,9 @@
#ifndef __alpha__
#undef __alpha__
#endif
+#ifndef __sw_64__
+#undef __sw_64__
+#endif
#ifndef __arm__
#undef __arm__
#endif
diff -Naur time-1.9.org/configure time-1.9.sw/configure
--- time-1.9.org/configure 2022-02-28 08:27:55.060000000 +0000
+++ time-1.9.sw/configure 2022-02-28 08:33:43.010000000 +0000
@@ -7989,6 +7989,10 @@
gl_cv_host_cpu_c_abi=alpha
;;
+ sw_64* )
+ gl_cv_host_cpu_c_abi=sw_64
+ ;;
+
arm* | aarch64 )
# Assume arm with EABI.
# On arm64 systems, the C compiler may be generating code in one of
diff -Naur time-1.9.org/lib/unistd.in.h time-1.9.sw/lib/unistd.in.h
--- time-1.9.org/lib/unistd.in.h 2022-02-28 08:27:55.070000000 +0000
+++ time-1.9.sw/lib/unistd.in.h 2022-02-28 08:30:24.650000000 +0000
@@ -871,7 +871,7 @@
# endif
/* This is for older VMS. */
# if !defined _gl_getpagesize && defined __VMS
-# ifdef __ALPHA
+# ifdef __ALPHA || defined __SW_64
# define _gl_getpagesize() 8192
# else
# define _gl_getpagesize() 512
diff -Naur time-1.9.org/m4/host-cpu-c-abi.m4 time-1.9.sw/m4/host-cpu-c-abi.m4
--- time-1.9.org/m4/host-cpu-c-abi.m4 2022-02-28 08:27:55.090000000 +0000
+++ time-1.9.sw/m4/host-cpu-c-abi.m4 2022-02-28 08:36:06.690000000 +0000
@@ -96,6 +96,12 @@
gl_cv_host_cpu_c_abi=alpha
;;
+changequote(,)dnl
+ sw_64* )
+changequote([,])dnl
+ gl_cv_host_cpu_c_abi=sw_64
+ ;;
+
arm* | aarch64 )
# Assume arm with EABI.
# On arm64 systems, the C compiler may be generating code in one of
@@ -304,6 +310,9 @@
#ifndef __alpha__
#undef __alpha__
#endif
+#ifndef __sw_64__
+#undef __sw_64__
+#endif
#ifndef __arm__
#undef __arm__
#endif

View File

@ -1,12 +1,10 @@
Name: time Name: time
Version: 1.9 Version: 1.9
Release: 10 Release: 7
Summary: Monitoring the system resources used by running program Summary: Monitoring the system resources used by running program
License: GPLv3+ and GFDL-1.3-or-later License: GPLv3+ and GFDL
URL: http://www.gnu.org/software/%{name}/ URL: http://www.gnu.org/software/%{name}/
Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
Patch0: add-help-opt.patch
Patch1: time-1.9-sw.patch
BuildRequires: autoconf automake bash coreutils gcc make texinfo sed BuildRequires: autoconf automake bash coreutils gcc make texinfo sed
@ -41,18 +39,6 @@ make check %{?_smp_mflags}
%{_infodir}/time.info* %{_infodir}/time.info*
%changelog %changelog
* Wed Jul 20 2022 wuzx<wuzx1226@qq.com> - 1.9-10
- add sw64 patch
* Sun May 29 2022 lijian <lijian2@kylinos.cn> - 1.9-9
- License compliance rectification
* Tue Mar 22 2022 Lv Genggeng <lvgenggeng@uniontech.com> - 1.9-8
- Type: enhancement
- ID: NA
- SUG: NA
- DESC: add help opt in cmdline
* Wed Jan 8 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.9-7 * Wed Jan 8 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.9-7
- Type: enhancement - Type: enhancement
- ID: NA - ID: NA

View File

@ -1,4 +0,0 @@
version_control: git
src_repo: https://git.savannah.gnu.org/git/time.git
tag_prefix: ^v
seperator: .