diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-12-20 15:22:56 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-22 13:13:47 +0000 |
commit | b917222da5d8a6a7d993ca7ae9c1d4a674de6681 (patch) | |
tree | 487487a6e4502b422646fa6eef1533bcc10efb3a /meta/recipes-extended/zypper/zypper | |
parent | 05eabde3e49845ef3f527f35c98d55c2fb5b522d (diff) | |
download | poky-b917222da5d8a6a7d993ca7ae9c1d4a674de6681.tar.gz |
zypper: add patch from libxml2
Due to Augaes adding the libxml2 requirement.
(From OE-Core rev: ec7c0fcda076c9ca3ed99d7885cfbac7a91e276b)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/zypper/zypper')
-rw-r--r-- | meta/recipes-extended/zypper/zypper/cmake_libxml2.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-extended/zypper/zypper/cmake_libxml2.patch b/meta/recipes-extended/zypper/zypper/cmake_libxml2.patch new file mode 100644 index 0000000000..8cda7a4963 --- /dev/null +++ b/meta/recipes-extended/zypper/zypper/cmake_libxml2.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
4 | |||
5 | Index: git/CMakeLists.txt | ||
6 | =================================================================== | ||
7 | --- git.orig/CMakeLists.txt 2011-12-20 15:13:59.851209493 -0800 | ||
8 | +++ git/CMakeLists.txt 2011-12-20 15:14:51.167211302 -0800 | ||
9 | @@ -25,6 +25,9 @@ | ||
10 | PKG_CHECK_MODULES(RPM REQUIRED rpm) | ||
11 | INCLUDE_DIRECTORIES( ${RPM_INCLUDE_DIRS} ) | ||
12 | |||
13 | +PKG_CHECK_MODULES(LIBXML REQUIRED libxml-2.0) | ||
14 | +INCLUDE_DIRECTORIES( ${LIBXML_INCLUDE_DIRS} ) | ||
15 | + | ||
16 | FIND_PACKAGE( Zypp REQUIRED ) | ||
17 | IF( ZYPP_FOUND ) | ||
18 | INCLUDE_DIRECTORIES(${ZYPP_INCLUDE_DIR}) | ||
19 | @@ -70,6 +73,9 @@ | ||
20 | INCLUDE(CTest) | ||
21 | ENABLE_TESTING() | ||
22 | |||
23 | +# New Augeas requires libxml now | ||
24 | +PKG_CHECK_MODULES(LIBXML REQUIRED libxml-2.0) | ||
25 | +INCLUDE_DIRECTORIES( ${LIBXML_INCLUDE_DIRS} ) | ||
26 | |||
27 | # documentation too important to be hidden in doc: | ||
28 | INSTALL( | ||