Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6917 from thess/socat-work

Browse source 
socat: Fix CRDLY, TABDLY and CSIZE shifts for PowerPC
This commit is contained in:
Ted Hess 2018-08-30 15:26:45 -04:00 committed by GitHub
commit 5f254b504d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
net/socat/Makefile
View file

@ -1,6 +1,4 @@
# #
# Copyright (C) 2006-2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
@ -9,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=socat PKG_NAME:=socat
PKG_VERSION:=1.7.3.2 PKG_VERSION:=1.7.3.2
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download
@ -63,11 +61,21 @@ ifneq ($(CONFIG_SOCAT_SSL),y)
CONFIGURE_ARGS+= --disable-openssl CONFIGURE_ARGS+= --disable-openssl
endif endif
CONFIGURE_VARS += \ # PowerPC has different TERMIOS bits
sc_cv_termios_ispeed="no" \ 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_crdly_shift=9 \
sc_cv_sys_tabdly_shift=11 \ sc_cv_sys_tabdly_shift=11 \
sc_cv_sys_csize_shift=4 \ sc_cv_sys_csize_shift=4
endif
CONFIGURE_VARS += \
sc_cv_termios_ispeed="no" \
ac_cv_header_bsd_libutil_h=no \ ac_cv_header_bsd_libutil_h=no \
ac_cv_lib_bsd_openpty=no \ ac_cv_lib_bsd_openpty=no \
BUILD_DATE=$(SOURCE_DATE_EPOCH) BUILD_DATE=$(SOURCE_DATE_EPOCH)