diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-01-31 15:44:19 -0500 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-01-31 15:44:19 -0500 |
| commit | 851547589048e0ac253d682d22b25b8baac3ce02 (patch) | |
| tree | 3be04f9b6370230050590442dc03ec56cbca2047 | |
| parent | 0d4fca1dddc3d23c583c55e77761f963e737731c (diff) | |
lxc/autoconf:: allow subdir objects
autoconf-1.14 will fail to configure lxc with the following warning (and
hence error):
| automake: warnings are treated as errors
| src/lxc/Makefile.am:79: warning: source file '../include/openpty.c' is in a subdirectory,
| src/lxc/Makefile.am:79: but option 'subdir-objects' is disabled
So we tell autoconf that subdir objects are fine .. and the issue is solved.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
| -rw-r--r-- | recipes-containers/lxc/files/lxc-0.9.0-configure-allow-subdir-objects.patch | 35 | ||||
| -rw-r--r-- | recipes-containers/lxc/lxc_0.9.0.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/recipes-containers/lxc/files/lxc-0.9.0-configure-allow-subdir-objects.patch b/recipes-containers/lxc/files/lxc-0.9.0-configure-allow-subdir-objects.patch new file mode 100644 index 0000000..3b4dd84 --- /dev/null +++ b/recipes-containers/lxc/files/lxc-0.9.0-configure-allow-subdir-objects.patch @@ -0,0 +1,35 @@ +From f3b86b0704cb62b77d80b90b40c1df68289d3558 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@windriver.com> +Date: Fri, 31 Jan 2014 15:37:24 -0500 +Subject: [PATCH] configure: allow subdir objects + +autoconf-1.14 will fail to configure lxc with the following warning (and +hence error): + + | automake: warnings are treated as errors + | src/lxc/Makefile.am:79: warning: source file '../include/openpty.c' is in a subdirectory, + | src/lxc/Makefile.am:79: but option 'subdir-objects' is disabled + +So we tell autoconf that subdir objects are fine .. and the issue is solved. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7dc82cfbcb8d..27ba250df3ac 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -6,7 +6,7 @@ AC_INIT([lxc], [0.9.0]) + AC_CONFIG_SRCDIR([configure.ac]) + AC_CONFIG_AUX_DIR([config]) + AC_CONFIG_HEADERS([src/config.h]) +-AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability]) ++AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability subdir-objects]) + AC_CANONICAL_HOST + AM_PROG_CC_C_O + AC_GNU_SOURCE +-- +1.7.10.4 + diff --git a/recipes-containers/lxc/lxc_0.9.0.bb b/recipes-containers/lxc/lxc_0.9.0.bb index f960a1f..cbe3f7a 100644 --- a/recipes-containers/lxc/lxc_0.9.0.bb +++ b/recipes-containers/lxc/lxc_0.9.0.bb @@ -28,6 +28,7 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \ file://lxc-0.9.0-don-t-let-LXC_PATH-end-in-failure.patch \ file://lxc-0.9.0-setup_netdev-re-read-ifindex-in-LXC_NET_PHYS-case.patch \ file://lxc-0.9.0-use-susv3-head-arguments.patch \ + file://lxc-0.9.0-configure-allow-subdir-objects.patch \ " SRC_URI[md5sum] = "8552a4479090616f4bc04d8473765fc9" SRC_URI[sha256sum] = "1e1767eae6cc5fbf892c0e193d25da420ba19f2db203716c38f7cdea3b654120" |