Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
04253a10ac
!12 修改为正确的release号
From: @hongjinghao 
Reviewed-by: @licunlong 
Signed-off-by: @licunlong
2022-10-25 02:37:45 +00:00
hongjinghao
3755998060 change to correct release 2022-10-25 09:17:00 +08:00
openeuler-ci-bot
f3cc89e2db
!8 添加sw架构
From: @wuzx065891 
Reviewed-by: @overweight 
Signed-off-by: @overweight
2022-07-25 02:51:52 +00:00
wzx
fdaa8a0b26 sw 2022-07-22 16:59:24 +08:00
openeuler-ci-bot
bdbbfaa118
!7 License compliance rectification
From: @jianli-97 
Reviewed-by: @overweight 
Signed-off-by: @overweight
2022-05-30 11:14:40 +00:00
jianli-97
cdbeadce46 License compliance rectification 2022-05-29 19:22:59 +08:00
openeuler-ci-bot
60fcab5666
!4 命令行添加帮助选项
From: @lvgenggeng 
Reviewed-by: @overweight 
Signed-off-by: @overweight
2022-03-31 02:39:44 +00:00
Lv Genggeng
8041797958 add help opt cmdline
Signed-off-by: Lv Genggeng <lvgenggeng@uniontech.com>
2022-03-22 19:59:50 +08:00
openeuler-ci-bot
099ff388bc !2 add yaml file in package
Merge pull request !2 from Markeryang/master
2020-06-18 15:04:48 +08:00
Markeryang
cb120f8bc3 add time.yaml. 2020-06-16 17:55:45 +08:00
4 changed files with 98 additions and 2 deletions

13
add-help-opt.patch Normal file
View File

@ -0,0 +1,13 @@
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)

65
time-1.9-sw.patch Executable file
View File

@ -0,0 +1,65 @@
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,10 +1,12 @@
Name: time
Version: 1.9
Release: 7
Release: 10
Summary: Monitoring the system resources used by running program
License: GPLv3+ and GFDL
License: GPLv3+ and GFDL-1.3-or-later
URL: http://www.gnu.org/software/%{name}/
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
@ -39,6 +41,18 @@ make check %{?_smp_mflags}
%{_infodir}/time.info*
%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
- Type: enhancement
- ID: NA

4
time.yaml Normal file
View File

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