summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-05-05 15:33:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-07 13:40:34 +0100
commitfd673b4ce58eaf623470c501d66edb032f381158 (patch)
tree4041c7c8aa2c97be8e46d9f78b4f878b894dce15 /meta
parent8381ffc675897909e55cbcc018093cf7d68c3caa (diff)
downloadpoky-fd673b4ce58eaf623470c501d66edb032f381158.tar.gz
libarchive: fix out of tree builds
(From OE-Core rev: 4201e432e4034907efeaebfea6509e821a9ba3c5) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/libarchive/libarchive/mkdir.patch45
-rw-r--r--meta/recipes-extended/libarchive/libarchive_3.1.2.bb3
2 files changed, 47 insertions, 1 deletions
diff --git a/meta/recipes-extended/libarchive/libarchive/mkdir.patch b/meta/recipes-extended/libarchive/libarchive/mkdir.patch
new file mode 100644
index 0000000000..509a2957a5
--- /dev/null
+++ b/meta/recipes-extended/libarchive/libarchive/mkdir.patch
@@ -0,0 +1,45 @@
1Add missing mkdir calls so that out-of-tree builds work.
2
3Upstream-Status: Submitted (https://github.com/libarchive/libarchive/pull/534)
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6diff --git a/Makefile.am b/Makefile.am
7index 3fa2d22..5ecca52 100644
8--- a/Makefile.am
9+++ b/Makefile.am
10@@ -508,6 +508,7 @@ libarchive_test_LDADD= $(LTLIBICONV)
11 # Building it automatically provides a sanity-check on libarchive_test_SOURCES
12 # above.
13 libarchive/test/list.h: Makefile
14+ $(MKDIR_P) libarchive/test
15 cat $(top_srcdir)/libarchive/test/test_*.c | grep DEFINE_TEST > libarchive/test/list.h
16
17 libarchive_TESTS_ENVIRONMENT= LIBARCHIVE_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/libarchive/test LRZIP=NOCONFIG
18@@ -835,6 +836,7 @@ bsdtar_test_CPPFLAGS=\
19 $(PLATFORMCPPFLAGS)
20
21 tar/test/list.h: Makefile
22+ $(MKDIR_P) tar/test
23 cat $(top_srcdir)/tar/test/test_*.c | grep DEFINE_TEST > tar/test/list.h
24
25 if BUILD_BSDTAR
26@@ -975,6 +977,7 @@ bsdcpio_test_CPPFLAGS= \
27 bsdcpio_test_LDADD=libarchive_fe.la
28
29 cpio/test/list.h: Makefile
30+ $(MKDIR_P) cpio/test
31 cat $(top_srcdir)/cpio/test/test_*.c | grep DEFINE_TEST > cpio/test/list.h
32
33 if BUILD_BSDCPIO
34diff --git a/configure.ac b/configure.ac
35index 38bd299..7bdb00c 100644
36--- a/configure.ac
37+++ b/configure.ac
38@@ -102,6 +102,7 @@ AC_USE_SYSTEM_EXTENSIONS
39 AC_LIBTOOL_WIN32_DLL
40 AC_PROG_LIBTOOL
41 AC_CHECK_TOOL([STRIP],[strip])
42+AC_PROG_MKDIR_P
43
44 #
45 # Options for building bsdtar.
diff --git a/meta/recipes-extended/libarchive/libarchive_3.1.2.bb b/meta/recipes-extended/libarchive/libarchive_3.1.2.bb
index 75008c3e26..aaa325535b 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.1.2.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.1.2.bb
@@ -33,12 +33,13 @@ SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
33 file://libarchive-CVE-2013-0211.patch \ 33 file://libarchive-CVE-2013-0211.patch \
34 file://pkgconfig.patch \ 34 file://pkgconfig.patch \
35 file://0001-Add-ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS-option.patch \ 35 file://0001-Add-ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS-option.patch \
36 file://mkdir.patch \
36 " 37 "
37 38
38SRC_URI[md5sum] = "efad5a503f66329bb9d2f4308b5de98a" 39SRC_URI[md5sum] = "efad5a503f66329bb9d2f4308b5de98a"
39SRC_URI[sha256sum] = "eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e" 40SRC_URI[sha256sum] = "eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e"
40 41
41inherit autotools-brokensep lib_package pkgconfig 42inherit autotools lib_package pkgconfig
42 43
43CPPFLAGS += "-I${WORKDIR}/extra-includes" 44CPPFLAGS += "-I${WORKDIR}/extra-includes"
44 45