serial-forward: Fix build with hardening+musl
PATCH 1/2 serial-forward: Fix build with hardening+musl
Signed-off-by Khem Raj <[email protected]>
--- ...al_forward-Disable-default-static-linking.patch | 29 ++++++++++++++++++++++ .../serial-utils/serial-forward_git.bb | 6 +++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch
meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch new file +29 -0
@@ -0,0 +1,29 @@ +From a0d815ad9918aba977aed9275b3bf3d750a1709b Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 30 Aug 2017 19:24:40 -0700 +Subject: [PATCH] serial_forward: Disable default static linking + +This does not work with ssp turned on with hardening flags on musl + +Signed-off-by: Khem Raj <[email protected]> +--- + tools/serial_forward/src/Makefile.am | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/tools/serial_forward/src/Makefile.am b/tools/serial_forward/src/Makefile.am +index 3f598286..bcac9bc9 100644 +--- a/tools/serial_forward/src/Makefile.am ++++ b/tools/serial_forward/src/Makefile.am +@@ -20,9 +20,6 @@ serial_forward_SOURCES = \ + cy8mrln.h \ + $(NULL) + +-serial_forward_LDFLAGS = \ +- -all-static +- + pty_forward_SOURCES = \ + pty_forward.c \ + $(NULL) +-- +2.14.1 +
meta-oe/recipes-support/serial-utils/serial-forward_git.bb +4 -2
@@ -3,10 +3,12 @@ AUTHOR = "Holger 'Zecke' Freyther'" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07" SECTION = "console/devel" -SRCREV = "00dbec2636ae0385ad028587e20e446272ff97ec" +SRCREV = "07c6fdede0870edc37a8d51d033b6e7e29aa7c91" PV = "1.1+gitr${SRCPV}" -SRC_URI = "git://github.com/freesmartphone/cornucopia.git" +SRC_URI = "git://github.com/freesmartphone/cornucopia.git \ + file://0001-serial_forward-Disable-default-static-linking.patch;striplevel=3 \ + " S = "${WORKDIR}/git/tools/serial_forward" inherit autotools
Signature · 1 line
2.14.1
PATCH 2/2 gsoap: Fix build with musl
Signed-off-by Khem Raj <[email protected]>
--- .../gsoap/0001-stdgsoap2-Fix-build-with-musl.patch | 63 ++++++++++++++++++++++ meta-oe/recipes-support/gsoap/gsoap_2.8.51.bb | 3 +- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/gsoap/gsoap/0001-stdgsoap2-Fix-build-with-musl.patch
meta-oe/recipes-support/gsoap/gsoap/0001-stdgsoap2-Fix-build-with-musl.patch new file +63 -0
@@ -0,0 +1,63 @@ +From db260fbc7af4c73c997c485a0c69c61594a0e59c Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 30 Aug 2017 19:48:50 -0700 +Subject: [PATCH] stdgsoap2: Fix build with musl + +Signed-off-by: Khem Raj <[email protected]> +--- + gsoap/stdsoap2.c | 2 +- + gsoap/stdsoap2.cpp | 4 ++-- + gsoap/stdsoap2.h | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c +index 58e9df4..62389e1 100644 +--- a/gsoap/stdsoap2.c ++++ b/gsoap/stdsoap2.c +@@ -4462,7 +4462,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr) + return soap->error = SOAP_EOM; + return SOAP_OK; + } +-#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) ++#if defined(LINUX) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) + if (gethostbyname_r(addr, &hostent, soap->buf, sizeof(soap->buf), &host, &soap->errnum) < 0) + host = NULL; + #elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) +diff --git a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp +index 58e9df4..b637161 100644 +--- a/gsoap/stdsoap2.cpp ++++ b/gsoap/stdsoap2.cpp +@@ -4462,7 +4462,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr) + return soap->error = SOAP_EOM; + return SOAP_OK; + } +-#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) ++#if defined(LINUX) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) + if (gethostbyname_r(addr, &hostent, soap->buf, sizeof(soap->buf), &host, &soap->errnum) < 0) + host = NULL; + #elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) +@@ -19658,7 +19658,7 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if defined(_GNU_SOURCE) && !defined(__ANDROID__) ++# if defined(_GNU_SOURCE) && !defined(__ANDROID__) && defined(__GLIBC__) + return strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* GNU-specific */ + # else + strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ +diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h +index 07a3952..c6ace4c 100644 +--- a/gsoap/stdsoap2.h ++++ b/gsoap/stdsoap2.h +@@ -947,7 +947,7 @@ extern "C" { + # endif + #elif defined(SOCKLEN_T) + # define SOAP_SOCKLEN_T SOCKLEN_T +-#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(OPENBSD) || defined(__QNX__) || defined(QNX) || defined(OS390) || defined(__ANDROID__) || defined(_XOPEN_SOURCE) ++#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(OPENBSD) || defined(__QNX__) || defined(QNX) || defined(OS390) || defined(__ANDROID__) || defined(_XOPEN_SOURCE) || defined (LINUX) + # define SOAP_SOCKLEN_T socklen_t + #elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS) + # define SOAP_SOCKLEN_T int +-- +2.14.1 +
meta-oe/recipes-support/gsoap/gsoap_2.8.51.bb +2 -1
@@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip \ file://0001-Fix-out-of-tree-builds.patch \ -" + file://0001-stdgsoap2-Fix-build-with-musl.patch \ + " SRC_URI[md5sum] = "212951d6e1435bb51fa4320f458809ea" SRC_URI[sha256sum] = "3e7bb24a9e492f5cb86daca34054c9787152f1d7b70add36b789d03816d5ffa1"
Signature · 1 line
2.14.1