summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Hess <thess@kitschensync.net>2018-08-30 14:00:05 -0400
committerTed Hess <thess@kitschensync.net>2018-08-30 15:23:57 -0400
commit40da7ecf21ffe1f3523ffa430c406e1db58ce3d4 (patch)
tree215f7e6324914e2a62cb05178852e8133916f196
parent1553fad25ff92426ae52dd27400396c36d406e03 (diff)
socat: Fix CRDLY, TABDLY and CSIZE shifts for PowerPC
Signed-off-by: Ted Hess <thess@kitschensync.net>
-rw-r--r--net/socat/Makefile22
1 files changed, 16 insertions, 6 deletions
diff --git a/net/socat/Makefile b/net/socat/Makefile
index ede942c35..d7980c622 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.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
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
TARGET_CFLAGS += \
-include stddef.h