mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 15:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

libarchive: fix out of tree builds

Browse Source 
(From OE-Core rev: 4201e432e4034907efeaebfea6509e821a9ba3c5)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2015-05-05 15:33:15 +01:00
committed by Richard Purdie
parent 8381ffc675
commit fd673b4ce5
2 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
meta/recipes-extended/libarchive/libarchive/mkdir.patch Normal file
View File

@@ -0,0 +1,45 @@
Add missing mkdir calls so that out-of-tree builds work.
Upstream-Status: Submitted (https://github.com/libarchive/libarchive/pull/534)
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/Makefile.am b/Makefile.am
index 3fa2d22..5ecca52 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -508,6 +508,7 @@ libarchive_test_LDADD= $(LTLIBICONV)
# Building it automatically provides a sanity-check on libarchive_test_SOURCES
# above.
libarchive/test/list.h: Makefile
+ $(MKDIR_P) libarchive/test
cat $(top_srcdir)/libarchive/test/test_*.c | grep DEFINE_TEST > libarchive/test/list.h
libarchive_TESTS_ENVIRONMENT= LIBARCHIVE_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/libarchive/test LRZIP=NOCONFIG
@@ -835,6 +836,7 @@ bsdtar_test_CPPFLAGS=\
$(PLATFORMCPPFLAGS)
tar/test/list.h: Makefile
+ $(MKDIR_P) tar/test
cat $(top_srcdir)/tar/test/test_*.c | grep DEFINE_TEST > tar/test/list.h
if BUILD_BSDTAR
@@ -975,6 +977,7 @@ bsdcpio_test_CPPFLAGS= \
bsdcpio_test_LDADD=libarchive_fe.la
cpio/test/list.h: Makefile
+ $(MKDIR_P) cpio/test
cat $(top_srcdir)/cpio/test/test_*.c | grep DEFINE_TEST > cpio/test/list.h
if BUILD_BSDCPIO
diff --git a/configure.ac b/configure.ac
index 38bd299..7bdb00c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,7 @@ AC_USE_SYSTEM_EXTENSIONS
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
AC_CHECK_TOOL([STRIP],[strip])
+AC_PROG_MKDIR_P
#
# Options for building bsdtar.

3
meta/recipes-extended/libarchive/libarchive_3.1.2.bb
View File

@@ -33,12 +33,13 @@ SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
file://libarchive-CVE-2013-0211.patch \
file://pkgconfig.patch \
file://0001-Add-ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS-option.patch \
file://mkdir.patch \
"
SRC_URI[md5sum] = "efad5a503f66329bb9d2f4308b5de98a"
SRC_URI[sha256sum] = "eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e"
inherit autotools-brokensep lib_package pkgconfig
inherit autotools lib_package pkgconfig
CPPFLAGS += "-I${WORKDIR}/extra-includes"