summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/serial-utils
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-08-30 22:28:26 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2017-09-07 10:56:39 +0200
commite9c79841b9c723c24e1e993492bcbb4b2b346fa3 (patch)
treecb541b33841000856a7065d1abccdc53595a2a4e /meta-oe/recipes-support/serial-utils
parente5681e1dca96d3f313b3b2b346789f22483d7881 (diff)
downloadmeta-openembedded-e9c79841b9c723c24e1e993492bcbb4b2b346fa3.tar.gz
serial-forward: Fix build with hardening+musl
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/serial-utils')
-rw-r--r--meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch29
-rw-r--r--meta-oe/recipes-support/serial-utils/serial-forward_git.bb6
2 files changed, 33 insertions, 2 deletions
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 000000000..7dcc67d11
--- /dev/null
+++ b/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch
@@ -0,0 +1,29 @@
1From a0d815ad9918aba977aed9275b3bf3d750a1709b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 30 Aug 2017 19:24:40 -0700
4Subject: [PATCH] serial_forward: Disable default static linking
5
6This does not work with ssp turned on with hardening flags on musl
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 tools/serial_forward/src/Makefile.am | 3 ---
11 1 file changed, 3 deletions(-)
12
13diff --git a/tools/serial_forward/src/Makefile.am b/tools/serial_forward/src/Makefile.am
14index 3f598286..bcac9bc9 100644
15--- a/tools/serial_forward/src/Makefile.am
16+++ b/tools/serial_forward/src/Makefile.am
17@@ -20,9 +20,6 @@ serial_forward_SOURCES = \
18 cy8mrln.h \
19 $(NULL)
20
21-serial_forward_LDFLAGS = \
22- -all-static
23-
24 pty_forward_SOURCES = \
25 pty_forward.c \
26 $(NULL)
27--
282.14.1
29
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 6494de9d3..0ef829856 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'"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07" 4LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07"
5SECTION = "console/devel" 5SECTION = "console/devel"
6SRCREV = "00dbec2636ae0385ad028587e20e446272ff97ec" 6SRCREV = "07c6fdede0870edc37a8d51d033b6e7e29aa7c91"
7PV = "1.1+gitr${SRCPV}" 7PV = "1.1+gitr${SRCPV}"
8 8
9SRC_URI = "git://github.com/freesmartphone/cornucopia.git" 9SRC_URI = "git://github.com/freesmartphone/cornucopia.git \
10 file://0001-serial_forward-Disable-default-static-linking.patch;striplevel=3 \
11 "
10S = "${WORKDIR}/git/tools/serial_forward" 12S = "${WORKDIR}/git/tools/serial_forward"
11 13
12inherit autotools 14inherit autotools