diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2022-04-18 19:58:04 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2022-04-19 06:59:45 +0200 |
| commit | 615523f1128f2b40168434af4e8e00e95136fa71 (patch) | |
| tree | 3068279d052c3271a7e83b6f953c52bbfcb8f33a /source/a/coreutils/coreutils.uname.diff | |
| parent | 8b9b348d17ffe04d5a5087505a9f30b2ff9c1ebe (diff) | |
| download | current-615523f1128f2b40168434af4e8e00e95136fa71.tar.gz current-615523f1128f2b40168434af4e8e00e95136fa71.tar.xz | |
Mon Apr 18 19:58:04 UTC 202220220418195804
a/coreutils-9.1-x86_64-1.txz: Upgraded.
kde/krita-5.0.5-x86_64-3.txz: Rebuilt.
Recompiled against quazip-1.3.
l/enchant-2.3.3-x86_64-1.txz: Upgraded.
l/imagemagick-7.1.0_30-x86_64-1.txz: Upgraded.
l/json-c-0.16_20220414-x86_64-1.txz: Upgraded.
l/libnl3-3.6.0-x86_64-1.txz: Upgraded.
l/pcre2-10.40-x86_64-1.txz: Upgraded.
l/quazip-1.3-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
n/rsync-3.2.4-x86_64-1.txz: Upgraded.
x/libpinyin-2.6.2-x86_64-1.txz: Upgraded.
xap/xsnow-3.5.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/coreutils/coreutils.uname.diff')
| -rw-r--r-- | source/a/coreutils/coreutils.uname.diff | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/source/a/coreutils/coreutils.uname.diff b/source/a/coreutils/coreutils.uname.diff index 699110318..3aec5e5f6 100644 --- a/source/a/coreutils/coreutils.uname.diff +++ b/source/a/coreutils/coreutils.uname.diff @@ -1,8 +1,7 @@ -diff -Nur coreutils-7.6.orig/src/uname.c coreutils-7.6/src/uname.c ---- coreutils-7.6.orig/src/uname.c 2009-09-01 06:01:16.000000000 -0500 -+++ coreutils-7.6/src/uname.c 2009-09-15 08:55:26.239452858 -0500 -@@ -50,6 +50,11 @@ - # include <mach-o/arch.h> +--- ./src/uname.c.orig 2022-04-08 06:22:18.000000000 -0500 ++++ ./src/uname.c 2022-04-17 13:30:46.550023254 -0500 +@@ -44,6 +44,11 @@ + # endif #endif +#if defined (__linux__) @@ -11,9 +10,9 @@ diff -Nur coreutils-7.6.orig/src/uname.c coreutils-7.6/src/uname.c +#endif + #include "system.h" + #include "die.h" #include "error.h" - #include "quote.h" -@@ -155,6 +160,106 @@ +@@ -149,6 +154,106 @@ exit (status); } @@ -120,23 +119,25 @@ diff -Nur coreutils-7.6.orig/src/uname.c coreutils-7.6/src/uname.c /* Print ELEMENT, preceded by a space if something has already been printed. */ -@@ -302,10 +407,14 @@ - if (toprint & PRINT_PROCESSOR) - { - char const *element = unknown; +@@ -323,11 +428,16 @@ + element = "powerpc"; + # endif + #endif -#if HAVE_SYSINFO && defined SI_ARCHITECTURE +#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO) - { - static char processor[257]; + if (element == unknown) + { + static char processor[257]; +#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) ++ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) +#else - if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) ++ + if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) +#endif - element = processor; - } + element = processor; + } #endif -@@ -358,9 +467,13 @@ +@@ -360,9 +470,13 @@ if (element == unknown) { static char hardware_platform[257]; |