From 6010fc1d1d5e82547b7aaae2571af9892a76b9d1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 30 Aug 2017 22:28:26 -0700 Subject: serial-forward: Fix build with hardening+musl Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...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 diff --git a/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch b/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch new file mode 100644 index 0000000000..7dcc67d114 --- /dev/null +++ b/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch @@ -0,0 +1,29 @@ +From a0d815ad9918aba977aed9275b3bf3d750a1709b Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- + 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 + diff --git a/meta-oe/recipes-support/serial-utils/serial-forward_git.bb b/meta-oe/recipes-support/serial-utils/serial-forward_git.bb index 6494de9d38..0ef829856c 100644 --- a/meta-oe/recipes-support/serial-utils/serial-forward_git.bb +++ b/meta-oe/recipes-support/serial-utils/serial-forward_git.bb @@ -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 -- cgit 1.2.3-korg