[Buildroot] [git commit branch/2017.02.x] package/socat: Fix TABDLY, CSIZE and CRDLY shifts for PowerPC

Peter Korsgaard peter at korsgaard.com
Thu Jun 8 20:41:41 UTC 2017


commit: https://git.buildroot.net/buildroot/commit/?id=1a9b9eb342fa5f6b51b68c0bb2311f35ed82ce3a
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2017.02.x

As can be seen in linux/arch/powerpc/include/uapi/asm/termbits.h are
defined as (note that those are octal numbers):

\#define TABDLY	00006000
\#define CSIZE	00001400
\#define CRDLY	00030000

which gives shifts of 10, 8 and 12. Adjust socat.mk accordingly to
reflect that difference.

Signed-off-by: Mark Hinds <zoronic at gmail.com>
Signed-off-by: Andrey Smirnov <andrew.smirnov at gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
(cherry picked from commit a52896f755a55d0fa30f6ba5092c69edaa73724d)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/socat/socat.mk | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index 754b210..b44b8e6 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -9,11 +9,20 @@ SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2
 SOCAT_SITE = http://www.dest-unreach.org/socat/download
 SOCAT_LICENSE = GPLv2
 SOCAT_LICENSE_FILES = COPYING
-SOCAT_CONF_ENV = \
-	sc_cv_termios_ispeed=no \
+
+SOCAT_CONF_ENV = sc_cv_termios_ispeed=no
+
+ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y)
+SOCAT_CONF_ENV += \
+	sc_cv_sys_crdly_shift=12 \
+	sc_cv_sys_tabdly_shift=10 \
+	sc_cv_sys_csize_shift=8
+else
+SOCAT_CONF_ENV += \
 	sc_cv_sys_crdly_shift=9 \
 	sc_cv_sys_tabdly_shift=11 \
 	sc_cv_sys_csize_shift=4
+endif
 
 # We need to run autoconf to regenerate the configure script, in order
 # to ensure that the test checking linux/ext2_fs.h works


More information about the buildroot mailing list