From 6680ce8650435ae7f7afd1a581d4f438cb893d6c Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Thu, 30 Aug 2018 14:00:05 -0400 Subject: [PATCH] socat: Fix CRDLY, TABDLY and CSIZE shifts for PowerPC Signed-off-by: Ted Hess --- net/socat/Makefile | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/net/socat/Makefile b/net/socat/Makefile index 8a28c792f2..be57601071 100644 --- a/net/socat/Makefile +++ b/net/socat/Makefile @@ -1,6 +1,4 @@ # -# Copyright (C) 2006-2015 OpenWrt.org -# # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # @@ -9,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=socat PKG_VERSION:=1.7.3.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download @@ -63,11 +61,23 @@ ifneq ($(CONFIG_SOCAT_SSL),y) CONFIGURE_ARGS+= --disable-openssl endif +# PowerPC has different TERMIOS bits +ifneq ($(findstring powerpc,$(CONFIG_ARCH)),) + CONFIGURE_VARS += \ + sc_cv_sys_crdly_shift=12 \ + sc_cv_sys_tabdly_shift=10 \ + sc_cv_sys_csize_shift=8 +else + CONFIGURE_VARS += \ + sc_cv_sys_crdly_shift=9 \ + sc_cv_sys_tabdly_shift=11 \ + sc_cv_sys_csize_shift=4 +endif + CONFIGURE_VARS += \ sc_cv_termios_ispeed="no" \ - sc_cv_sys_crdly_shift=9 \ - sc_cv_sys_tabdly_shift=11 \ - sc_cv_sys_csize_shift=4 \ + ac_cv_header_bsd_libutil_h=no \ + ac_cv_lib_bsd_openpty=no \ BUILD_DATE=$(SOURCE_DATE_EPOCH) define Package/socat/install -- 2.30.2