Skip to contentSkip to conversation

procps-ng: fix build without wide character support

PATCH New Baruch Siach 2 participants 4 messages Apr 27, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 procps-ng: fix build without wide character support

Define OFF_XTRAWIDE to disable use of wchar API when the toolchain does not support that.

Fixes:
http://autobuild.buildroot.net/results/b96/b96d29d64f455726a53a7adcfd3edd546346201c/

---
 package/procps-ng/procps-ng.mk | 4 ++++
 1 file changed, 4 insertions(+)
package/procps-ng/procps-ng.mk +4 -0
index a6cf774d7bd2..0d5ce9ddf085 100644
@@ -40,6 +40,10 @@ PROCPS_NG_CONF_OPTS += \
 	--enable-watch8bit
 endif
 
+ifeq ($(BR2_USE_WCHAR),)
+PROCPS_NG_CONF_OPTS += CPPFLAGS=-DOFF_XTRAWIDE
+endif
+
 # numa support requires libdl, so explicitly disable it when
 # BR2_STATIC_LIBS=y
 ifeq ($(BR2_STATIC_LIBS),y)
Signature · 1 line
2.17.0
#1 lore raw

PATCH 2/2 procps-ng: fix build for sparc

Add a patch taken from upstream bug report to fix wrong signal undefined in sparc.

Fixes:
http://autobuild.buildroot.net/results/b02/b02bd2e4032287d3c5c58255d621ef785c5d1380/

---
 .../0001-proc-sig-fix-build-for-sparc.patch   | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 package/procps-ng/0001-proc-sig-fix-build-for-sparc.patch
package/procps-ng/0001-proc-sig-fix-build-for-sparc.patch new file +43 -0
new file mode 100644
index 000000000000..74f822aea357
@@ -0,0 +1,43 @@
+From 070feb7c5ebd0f2ca721ca5d75bdd3fd8cffe961 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <[email protected]>
+Date: Fri, 27 Apr 2018 07:34:57 +0300
+Subject: [PATCH] proc/sig: fix build for sparc
+
+The code undefines SIGLOST which breaks references to SIGPWR.
+
+Taken from a patch suggested in upstream bug report #93.
+
+Signed-off-by: Baruch Siach <[email protected]>
+---
+Upstream status: https://gitlab.com/procps-ng/procps/issues/93
+---
+ proc/sig.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/proc/sig.c b/proc/sig.c
+index b883185fc28a..6ca9512cc70c 100644
+--- a/proc/sig.c
++++ b/proc/sig.c
+@@ -52,10 +52,6 @@
+ #  undef SIGSTKFLT
+ #endif
+ 
+-#if !defined(__GNU__) && defined(SIGLOST)
+-#  undef SIGLOST
+-#endif
+-
+ #ifndef SIGRTMIN
+ #  warning Standards require that <signal.h> define SIGRTMIN; assuming 32
+ #  define SIGRTMIN 32
+@@ -87,7 +83,7 @@ static const mapstruct sigtable[] = {
+   {"ILL",    SIGILL},
+   {"INT",    SIGINT},
+   {"KILL",   SIGKILL},
+-#ifdef SIGLOST
++#if defined(__GNU__)
+   {"LOST",   SIGLOST},  /* Hurd-specific */
+ #endif
+   {"PIPE",   SIGPIPE},
+-- 
+2.17.0
+
Signature · 1 line
2.17.0
#2 lore raw

PATCH 2/2 procps-ng: fix build for sparc

Quoted 48 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

Add a patch taken from upstream bug report to fix wrong signal undefined in sparc.

Fixes:
http://autobuild.buildroot.net/results/b02/b02bd2e4032287d3c5c58255d621ef785c5d1380/

---
 .../0001-proc-sig-fix-build-for-sparc.patch   | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 package/procps-ng/0001-proc-sig-fix-build-for-sparc.patch
package/procps-ng/0001-proc-sig-fix-build-for-sparc.patch new file +27 -0
new file mode 100644
index 000000000000..74f822aea357
@@ -0,0 +1,43 @@
+From 070feb7c5ebd0f2ca721ca5d75bdd3fd8cffe961 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <[email protected]>
+Date: Fri, 27 Apr 2018 07:34:57 +0300
+Subject: [PATCH] proc/sig: fix build for sparc
+
+The code undefines SIGLOST which breaks references to SIGPWR.
+
+Taken from a patch suggested in upstream bug report #93.
+
+Signed-off-by: Baruch Siach <[email protected]>
+---
+Upstream status: https://gitlab.com/procps-ng/procps/issues/93
+---
+ proc/sig.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/proc/sig.c b/proc/sig.c
+index b883185fc28a..6ca9512cc70c 100644
+--- a/proc/sig.c
++++ b/proc/sig.c
+@@ -52,10 +52,6 @@
+ #  undef SIGSTKFLT
+ #endif
+ 
+-#if !defined(__GNU__) && defined(SIGLOST)
+-#  undef SIGLOST
+-#endif

package/procps-ng/0001-proc-sig-fix-build-for-sparc.patch line 37

Quoted 10 lines
package/procps-ng/0001-proc-sig-fix-build-for-sparc.patch new file +10 -0
+-
+ #ifndef SIGRTMIN
+ #  warning Standards require that <signal.h> define SIGRTMIN; assuming 32
+ #  define SIGRTMIN 32
+@@ -87,7 +83,7 @@ static const mapstruct sigtable[] = {
+   {"ILL",    SIGILL},
+   {"INT",    SIGINT},
+   {"KILL",   SIGKILL},
+-#ifdef SIGLOST
++#if defined(__GNU__)

It might have been nicer to do:

#if defined(__GNU__) && defined(SIGLOST)

To keep the behaviour for the __GNU__ case, but ok.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/2 procps-ng: fix build without wide character support

In reply to Baruch Siach
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

Define OFF_XTRAWIDE to disable use of wchar API when the toolchain does not support that.

Fixes:
http://autobuild.buildroot.net/results/b96/b96d29d64f455726a53a7adcfd3edd546346201c/

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard