summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libaio
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/libaio')
-rw-r--r--meta/recipes-extended/libaio/libaio/destdir.patch17
-rw-r--r--meta/recipes-extended/libaio/libaio/system-linkage.patch18
-rw-r--r--meta/recipes-extended/libaio/libaio_0.3.112.bb (renamed from meta/recipes-extended/libaio/libaio_0.3.111.bb)3
3 files changed, 8 insertions, 30 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 @@
1Upstream-Status: Pending
2
3from openembedded, added by Qing He <qing.he@intel.com>
4
5Index: 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'
12Upstream-Status: Pending 12Upstream-Status: Pending
13Signed-off-by: Ross Burton <ross.burton@intel.com> 13Signed-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
18diff --git a/src/Makefile b/src/Makefile 18diff --git a/src/Makefile b/src/Makefile
19index eadb336..56ab701 100644 19index 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--
362.1.4 322.25.1
37 33
diff --git a/meta/recipes-extended/libaio/libaio_0.3.111.bb b/meta/recipes-extended/libaio/libaio_0.3.112.bb
index 8e1cd349a0..b3606474a5 100644
--- a/meta/recipes-extended/libaio/libaio_0.3.111.bb
+++ b/meta/recipes-extended/libaio/libaio_0.3.112.bb
@@ -7,11 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499"
7 7
8SRC_URI = "git://pagure.io/libaio.git;protocol=https \ 8SRC_URI = "git://pagure.io/libaio.git;protocol=https \
9 file://00_arches.patch \ 9 file://00_arches.patch \
10 file://destdir.patch \
11 file://libaio_fix_for_mips_syscalls.patch \ 10 file://libaio_fix_for_mips_syscalls.patch \
12 file://system-linkage.patch \ 11 file://system-linkage.patch \
13 " 12 "
14SRCREV = "f66be22ab0a59a39858900ab72a8c6a6e8b0b7ec" 13SRCREV = "d025927efa75a0d1b46ca3a5ef331caa2f46ee0e"
15S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
16 15
17EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}" 16EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}"