summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/libaio/libaio/system-linkage.patch37
-rw-r--r--meta/recipes-extended/libaio/libaio_0.3.110.bb9
2 files changed, 39 insertions, 7 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
diff --git a/meta/recipes-extended/libaio/libaio_0.3.110.bb b/meta/recipes-extended/libaio/libaio_0.3.110.bb
index cbe29ce2ab..2adfa0aa4c 100644
--- a/meta/recipes-extended/libaio/libaio_0.3.110.bb
+++ b/meta/recipes-extended/libaio/libaio_0.3.110.bb
@@ -11,18 +11,13 @@ SRC_URI = "${DEBIAN_MIRROR}/main/liba/libaio/libaio_${PV}.orig.tar.gz \
11 file://destdir.patch \ 11 file://destdir.patch \
12 file://libaio_fix_for_x32.patch \ 12 file://libaio_fix_for_x32.patch \
13 file://libaio_fix_for_mips_syscalls.patch \ 13 file://libaio_fix_for_mips_syscalls.patch \
14" 14 file://system-linkage.patch \
15 "
15 16
16SRC_URI[md5sum] = "2a35602e43778383e2f4907a4ca39ab8" 17SRC_URI[md5sum] = "2a35602e43778383e2f4907a4ca39ab8"
17SRC_URI[sha256sum] = "e019028e631725729376250e32b473012f7cb68e1f7275bfc1bbcdd0f8745f7e" 18SRC_URI[sha256sum] = "e019028e631725729376250e32b473012f7cb68e1f7275bfc1bbcdd0f8745f7e"
18 19
19EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}" 20EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}"
20# Need libc for stack-protector's __stack_chk_fail_local() bounce function
21LDFLAGS_append_x86 = " -lc"
22
23do_configure () {
24 sed -i 's#LINK_FLAGS=.*#LINK_FLAGS=$(LDFLAGS)#' src/Makefile
25}
26 21
27do_install () { 22do_install () {
28 oe_runmake install DESTDIR=${D} 23 oe_runmake install DESTDIR=${D}