summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libaio/libaio
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-11-06 15:30:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-14 15:18:28 +0000
commit44639bd817f5f42c364333f741168f3b9a3fb950 (patch)
treeb1356a3ac9c6ec47db4df873f4012f1fc39a00b3 /meta/recipes-extended/libaio/libaio
parenta0be9bd862d039307f8349c66496f409290de075 (diff)
downloadpoky-44639bd817f5f42c364333f741168f3b9a3fb950.tar.gz
libaio: don't disable linking to the system libraries
For some reason that I don't understand (a decade-old attempt at optimisation?) libaio disables linkage to the system libraries. Enabling fortify means linking to the system libraries, so remove the existing addition of -lc for x86 (the problem also happens on at least PPC) and just link to the system libraries on all platforms. Also remove the sed of src/Makefile as the build not respecting LDFLAGS has been fixed upstream. (From OE-Core rev: f435ac9db0581d8313a38d586b00c2b3de419298) (From OE-Core rev: 901af5a00338fd8f1ace939123484ea91c090a7a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/libaio/libaio')
-rw-r--r--meta/recipes-extended/libaio/libaio/system-linkage.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-extended/libaio/libaio/system-linkage.patch b/meta/recipes-extended/libaio/libaio/system-linkage.patch
new file mode 100644
index 0000000000..0b1f475697
--- /dev/null
+++ b/meta/recipes-extended/libaio/libaio/system-linkage.patch
@@ -0,0 +1,37 @@
1From 94bba6880b1f10c6b3bf33a17ac40935d65a81ae Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Fri, 6 Nov 2015 15:19:46 +0000
4Subject: [PATCH] Don't remove the system libraries and startup files from
5 libaio, as in some build configurations these are required. For example,
6 including conf/include/security_flags.inc on PPC results in:
7
8io_queue_init.os: In function `io_queue_init':
9tmp/work/ppce300c3-poky-linux/libaio/0.3.110-r0/libaio-0.3.110/src/io_queue_init.c:33:
10undefined reference to `__stack_chk_fail_local'
11
12Upstream-Status: Pending
13Signed-off-by: Ross Burton <ross.burton@intel.com>
14---
15 src/Makefile | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/src/Makefile b/src/Makefile
19index eadb336..56ab701 100644
20--- a/src/Makefile
21+++ b/src/Makefile
22@@ -3,10 +3,10 @@ includedir=$(prefix)/include
23 libdir=$(prefix)/lib
24
25 CFLAGS ?= -g -fomit-frame-pointer -O2
26-CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC
27+CFLAGS += -Wall -I. -fPIC
28 SO_CFLAGS=-shared $(CFLAGS)
29 L_CFLAGS=$(CFLAGS)
30-LINK_FLAGS=
31+LINK_FLAGS=$(LDFLAGS)
32 LINK_FLAGS+=$(LDFLAGS)
33
34 soname=libaio.so.1
35--
362.1.4
37