diff options
author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2020-12-08 14:12:32 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-15 22:51:56 +0000 |
commit | 5bc29f4995163122098edd0a22994249d87610e7 (patch) | |
tree | dd1a240bb73148e820ba4064b44482a0ddce0645 /meta/recipes-extended/libaio/libaio | |
parent | 8f71d4b7d61ab505202e7108ca6802de0b539e18 (diff) | |
download | poky-5bc29f4995163122098edd0a22994249d87610e7.tar.gz |
libaio: upgrade 0.3.111 -> 0.3.112
destdir.patch
removed since it is included in 0.3.112
modify system-linkage.patch
(From OE-Core rev: 3b94e8c369960b0ed1e2949204a587a2952edf79)
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.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/destdir.patch | 17 | ||||
-rw-r--r-- | meta/recipes-extended/libaio/libaio/system-linkage.patch | 18 |
2 files changed, 7 insertions, 28 deletions
diff --git a/meta/recipes-extended/libaio/libaio/destdir.patch b/meta/recipes-extended/libaio/libaio/destdir.patch deleted file mode 100644 index 0f90406bee..0000000000 --- a/meta/recipes-extended/libaio/libaio/destdir.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | from openembedded, added by Qing He <qing.he@intel.com> | ||
4 | |||
5 | Index: libaio-0.3.110/Makefile | ||
6 | =================================================================== | ||
7 | --- libaio-0.3.110.orig/Makefile | ||
8 | +++ libaio-0.3.110/Makefile | ||
9 | @@ -15,7 +15,7 @@ all: | ||
10 | @$(MAKE) -C src | ||
11 | |||
12 | install: | ||
13 | - @$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir) | ||
14 | + @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir) | ||
15 | |||
16 | check: | ||
17 | @$(MAKE) -C harness check | ||
diff --git a/meta/recipes-extended/libaio/libaio/system-linkage.patch b/meta/recipes-extended/libaio/libaio/system-linkage.patch index 0b1f475697..cc91ea99d9 100644 --- a/meta/recipes-extended/libaio/libaio/system-linkage.patch +++ b/meta/recipes-extended/libaio/libaio/system-linkage.patch | |||
@@ -12,26 +12,22 @@ undefined reference to `__stack_chk_fail_local' | |||
12 | Upstream-Status: Pending | 12 | Upstream-Status: Pending |
13 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 13 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
14 | --- | 14 | --- |
15 | src/Makefile | 4 ++-- | 15 | src/Makefile | 2 +- |
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 17 | ||
18 | diff --git a/src/Makefile b/src/Makefile | 18 | diff --git a/src/Makefile b/src/Makefile |
19 | index eadb336..56ab701 100644 | 19 | index 37ae219..22e0c9a 100644 |
20 | --- a/src/Makefile | 20 | --- a/src/Makefile |
21 | +++ b/src/Makefile | 21 | +++ b/src/Makefile |
22 | @@ -3,10 +3,10 @@ includedir=$(prefix)/include | 22 | @@ -6,7 +6,7 @@ CFLAGS ?= -g -fomit-frame-pointer -O2 |
23 | libdir=$(prefix)/lib | 23 | CFLAGS += -Wall -I. -fPIC |
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) | 24 | SO_CFLAGS=-shared $(CFLAGS) |
29 | L_CFLAGS=$(CFLAGS) | 25 | L_CFLAGS=$(CFLAGS) |
30 | -LINK_FLAGS= | 26 | -LINK_FLAGS= |
31 | +LINK_FLAGS=$(LDFLAGS) | 27 | +LINK_FLAGS=$(LDFLAGS) |
32 | LINK_FLAGS+=$(LDFLAGS) | 28 | LINK_FLAGS+=$(LDFLAGS) |
29 | ENABLE_SHARED ?= 1 | ||
33 | 30 | ||
34 | soname=libaio.so.1 | ||
35 | -- | 31 | -- |
36 | 2.1.4 | 32 | 2.25.1 |
37 | 33 | ||