summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-01-19 21:21:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-26 22:49:38 +0000
commit1d0332deef46d61dd8fed648578e00b40822c896 (patch)
treee75b10aaa41b90f5885402e5fece2931854e5f65
parent9f22898e0f9155a75c6b6f44869b129e505910e8 (diff)
downloadpoky-1d0332deef46d61dd8fed648578e00b40822c896.tar.gz
argp-standalone: Fix build when S != B
accesses headers from source tree. (From OE-Core rev: d79a742f43a01f1737fcc5a972654ca84ea61baf) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/argp-standalone/argp-standalone_1.3.bb1
-rw-r--r--meta/recipes-support/argp-standalone/files/out_of_tree_build.patch19
2 files changed, 20 insertions, 0 deletions
diff --git a/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb b/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb
index a5d20d30a4..d61c8be241 100644
--- a/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb
+++ b/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb
@@ -10,6 +10,7 @@ SECTION = "libs"
10SRC_URI = "http://www.lysator.liu.se/~nisse/misc/argp-standalone-${PV}.tar.gz \ 10SRC_URI = "http://www.lysator.liu.se/~nisse/misc/argp-standalone-${PV}.tar.gz \
11 file://0001-throw-in-funcdef.patch \ 11 file://0001-throw-in-funcdef.patch \
12 file://0002-isprint.patch \ 12 file://0002-isprint.patch \
13 file://out_of_tree_build.patch \
13 " 14 "
14SRC_URI[md5sum] = "720704bac078d067111b32444e24ba69" 15SRC_URI[md5sum] = "720704bac078d067111b32444e24ba69"
15SRC_URI[sha256sum] = "dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be" 16SRC_URI[sha256sum] = "dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be"
diff --git a/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch b/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch
new file mode 100644
index 0000000000..b7777cbd91
--- /dev/null
+++ b/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch
@@ -0,0 +1,19 @@
1Fix the testsuite to built out of tree
2in OE S != B
3
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5Upstream-Status: Pending
6Index: argp-standalone-1.3/testsuite/Makefile.am
7===================================================================
8--- argp-standalone-1.3.orig/testsuite/Makefile.am
9+++ argp-standalone-1.3/testsuite/Makefile.am
10@@ -5,7 +5,8 @@ TS_ALL = $(TS_PROGS) $(TS_SH)
11
12 noinst_PROGRAMS = $(TS_PROGS) ex1 ex3 ex4
13
14-LDADD = ../libargp.a
15+AM_CPPFLAGS = -I$(top_srcdir)
16+LDADD = $(top_builddir)/libargp.a
17
18 EXTRA_DIST = $(TS_SH) run-tests
19 CLEANFILES = test.out