From 92bc2b3e84f71871878ae6137ae08af7cb981ed0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 11 Sep 2018 12:18:33 -0700 Subject: socat: Cache shift value for CRDLY, TABDLY and CSIZE Match it to definitions in arch//include/uapi/asm/termbits.h (From OE-Core rev: 3e222bf3e0631b385dc46b02b6ba890451c291b2) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-connectivity/socat/socat_1.7.3.2.bb | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'meta/recipes-connectivity/socat') diff --git a/meta/recipes-connectivity/socat/socat_1.7.3.2.bb b/meta/recipes-connectivity/socat/socat_1.7.3.2.bb index 4dcb7b4adc..927df7463a 100644 --- a/meta/recipes-connectivity/socat/socat_1.7.3.2.bb +++ b/meta/recipes-connectivity/socat/socat_1.7.3.2.bb @@ -11,7 +11,6 @@ LICENSE = "GPL-2.0+-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://README;beginline=257;endline=287;md5=338c05eadd013872abb1d6e198e10a3f" - SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ file://Makefile.in-fix-for-parallel-build.patch \ file://0001-define-NETDB_INTERNAL-to-1-if-not-available.patch \ @@ -26,9 +25,23 @@ inherit autotools EXTRA_AUTORECONF += "--exclude=autoheader" EXTRA_OECONF += "ac_cv_have_z_modifier=yes \ - ac_cv_header_bsd_libutil_h=no \ + ac_cv_header_bsd_libutil_h=no \ + sc_cv_termios_ispeed=no \ + ${TERMBITS_SHIFTS} \ " +TERMBITS_SHIFTS ?= "sc_cv_sys_crdly_shift=9 \ + sc_cv_sys_tabdly_shift=11 \ + sc_cv_sys_csize_shift=4" + +TERMBITS_SHIFTS_powerpc = "sc_cv_sys_crdly_shift=12 \ + sc_cv_sys_tabdly_shift=10 \ + sc_cv_sys_csize_shift=8" + +TERMBITS_SHIFTS_powerpc64 = "sc_cv_sys_crdly_shift=12 \ + sc_cv_sys_tabdly_shift=10 \ + sc_cv_sys_csize_shift=8" + PACKAGECONFIG_class-target ??= "tcp-wrappers" PACKAGECONFIG ??= "" PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" -- cgit v1.2.3-54-g00ecf