bce8f29a0e
- Sync patches with Debian and Fedora:
* Add man page (time.1).
* Less nonverbose output (time-fedora-verbose.patch).
* Fix maximal RSS report
(time-fedora-ru_maxrss-is-in-kilobytes-on-Linux.patch,
bnc#836049, Redhat#702826).
* Switch to microsecond accuracy if miliseconds arithmetic rounds
to zero
(time-fedora-Recompute-CPU-usage-at-microsecond-level.patch,
Redhat#527276).
* When time exits in a non-normal way, return 128 plus the number
of the signal which caused time to stop or abort
(time-debian-non-normal-exit.patch).
* struct rusage and sys/resource.h portability fix
(time-debian-rusage-portability.patch, Debian#144819).
* Add -q,--quiet functionality
(time-debian-quiet.patch, Debian#56853).
* Update bug reporting address
(time-debian-bug-address.patch, Debian#542469).
* Modernize the configure.in file to current autoconf style
(time-debian-configure.patch).
* Add a directory entry to the info page
(time-debian-info-direntry.patch).
- Fix FSF address (time-fsf-address.patch).
- Update Summary.
- Rename time-1.7.diff to time-alpha.patch.
... And cherry pick changelog entries relevant to time.
OBS-URL: https://build.opensuse.org/request/show/198137
OBS-URL: https://build.opensuse.org/package/show/Base:System/time?expand=0&rev=3
42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
Subject: struct rusage and sys/resource.h portability fix
|
|
Author: Dirk Eddelbuettel
|
|
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=144819
|
|
|
|
--- time-1.7.orig/resuse.h
|
|
+++ time-1.7/resuse.h
|
|
@@ -38,22 +38,11 @@
|
|
#else
|
|
# define TV_MSEC tv_usec / 1000
|
|
# define TV_USEC tv_usec
|
|
-# if HAVE_WAIT3
|
|
+# if HAVE_SYS_RESOURCE_H
|
|
# include <sys/resource.h>
|
|
# else
|
|
# if defined(__linux__) && defined(__alpha__)
|
|
# include <sys/resource.h>
|
|
-# else
|
|
-/* Process resource usage structure. */
|
|
-struct rusage
|
|
-{
|
|
- struct timeval ru_utime; /* User time used. */
|
|
- struct timeval ru_stime; /* System time used. */
|
|
- int ru_maxrss, ru_ixrss, ru_idrss, ru_isrss,
|
|
- ru_minflt, ru_majflt, ru_nswap, ru_inblock,
|
|
- ru_oublock, ru_msgsnd, ru_msgrcv, ru_nsignals,
|
|
- ru_nvcsw, ru_nivcsw;
|
|
-};
|
|
# endif
|
|
# endif
|
|
#endif
|
|
--- time-1.7.orig/configure.in
|
|
+++ time-1.7/configure.in
|
|
@@ -15,7 +15,7 @@
|
|
dnl Checks for header files.
|
|
AC_HEADER_STDC
|
|
AC_HEADER_SYS_WAIT
|
|
-AC_CHECK_HEADERS(unistd.h string.h sys/rusage.h)
|
|
+AC_CHECK_HEADERS(unistd.h string.h sys/rusage.h sys/resource.h)
|
|
|
|
dnl Checks for typedefs, structures, and compiler characteristics.
|
|
AC_C_CONST
|