socat: Cache shift value for CRDLY, TABDLY and CSIZE
PATCH 1/1 socat: Cache shift value for CRDLY, TABDLY and CSIZE
Match it to definitions in
arch/<ARCH>/include/uapi/asm/termbits.h
--- .../recipes-connectivity/socat/socat_1.7.3.2.bb | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
meta/recipes-connectivity/socat/socat_1.7.3.2.bb +15 -2
@@ -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=9 \ + sc_cv_sys_tabdly_shift=11 \ + sc_cv_sys_csize_shift=4" + PACKAGECONFIG_class-target ??= "tcp-wrappers" PACKAGECONFIG ??= "" PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
Signature · 1 line
2.18.0
Quoted 31 lines · Khem Raj
Match it to definitions in
arch/<ARCH>/include/uapi/asm/termbits.hSigned-off-by Khem Raj <[email protected]>--- .../recipes-connectivity/socat/socat_1.7.3.2.bb | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)meta/recipes-connectivity/socat/socat_1.7.3.2.bb +4
-2@@ -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 \
meta/recipes-connectivity/socat/socat_1.7.3.2.bb inherit autotools · line 43
Quoted 10 lines
meta/recipes-connectivity/socat/socat_1.7.3.2.bb +10
-0+ 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=9 \ + sc_cv_sys_tabdly_shift=11 \ + sc_cv_sys_csize_shift=4"
The _powerpc64 over-ride is forcing TERMBITS_SHIFTS back to the default. Is that the intention?
Quoted 11 lines
meta/recipes-connectivity/socat/socat_1.7.3.2.bb +0
-1PACKAGECONFIG_class-target ??= "tcp-wrappers" PACKAGECONFIG ??= "" PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" --2.18.0
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
No, it isn't. infact it should be same as powerpc
Quoted 58 lines · Andre McCurdy
Quoted 31 lines · Khem Raj
Match it to definitions in
arch/<ARCH>/include/uapi/asm/termbits.hSigned-off-by Khem Raj <[email protected]>--- .../recipes-connectivity/socat/socat_1.7.3.2.bb | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)meta/recipes-connectivity/socat/socat_1.7.3.2.bb +4
-2@@ -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 \meta/recipes-connectivity/socat/socat_1.7.3.2.bb inherit autotools · line 43
Quoted 10 lines
meta/recipes-connectivity/socat/socat_1.7.3.2.bb +10
-0+ 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=9 \ + sc_cv_sys_tabdly_shift=11 \ + sc_cv_sys_csize_shift=4"The
_powerpc64over-ride is forcingTERMBITS_SHIFTSback to the default. Is that the intention?Quoted 11 lines
meta/recipes-connectivity/socat/socat_1.7.3.2.bb +0
-1PACKAGECONFIG_class-target ??= "tcp-wrappers" PACKAGECONFIG ??= "" PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" --2.18.0
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core