diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/zypper/zypper/cmake_libxml2.patch | 28 | ||||
-rw-r--r-- | meta/recipes-extended/zypper/zypper_git.bb | 3 |
2 files changed, 30 insertions, 1 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( | ||
diff --git a/meta/recipes-extended/zypper/zypper_git.bb b/meta/recipes-extended/zypper/zypper_git.bb index 4f4fc4dc8c..e5963be5b9 100644 --- a/meta/recipes-extended/zypper/zypper_git.bb +++ b/meta/recipes-extended/zypper/zypper_git.bb | |||
@@ -5,13 +5,14 @@ LICENSE = "GPLv2+" | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413" |
6 | 6 | ||
7 | DEPENDS = "libzypp augeas" | 7 | DEPENDS = "libzypp augeas" |
8 | PR = "r6" | 8 | PR = "r1" |
9 | SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582" | 9 | SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582" |
10 | 10 | ||
11 | inherit cmake | 11 | inherit cmake |
12 | 12 | ||
13 | SRC_URI = "git://github.com/openSUSE/zypper.git;protocol=git \ | 13 | SRC_URI = "git://github.com/openSUSE/zypper.git;protocol=git \ |
14 | file://cmake.patch \ | 14 | file://cmake.patch \ |
15 | file://cmake_libxml2.patch \ | ||
15 | file://dso_linking_change_build_fix.patch \ | 16 | file://dso_linking_change_build_fix.patch \ |
16 | file://rpm5-flag.patch \ | 17 | file://rpm5-flag.patch \ |
17 | " | 18 | " |