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:31 +0000 |
| commit | ec7c0fcda076c9ca3ed99d7885cfbac7a91e276b (patch) | |
| tree | c1eb1db509496037516cca4ff6efb2a195c5b43c | |
| parent | 5eafbe2d8684ee1c45477bfd69b579af47adccd9 (diff) | |
| download | openembedded-core-contrib-ec7c0fcda076c9ca3ed99d7885cfbac7a91e276b.tar.gz | |
zypper: add patch from libxml2
Due to Augaes adding the libxml2 requirement.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -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 @@ +Upstream-Status: Pending + +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +Index: git/CMakeLists.txt +=================================================================== +--- git.orig/CMakeLists.txt 2011-12-20 15:13:59.851209493 -0800 ++++ git/CMakeLists.txt 2011-12-20 15:14:51.167211302 -0800 +@@ -25,6 +25,9 @@ + PKG_CHECK_MODULES(RPM REQUIRED rpm) + INCLUDE_DIRECTORIES( ${RPM_INCLUDE_DIRS} ) + ++PKG_CHECK_MODULES(LIBXML REQUIRED libxml-2.0) ++INCLUDE_DIRECTORIES( ${LIBXML_INCLUDE_DIRS} ) ++ + FIND_PACKAGE( Zypp REQUIRED ) + IF( ZYPP_FOUND ) + INCLUDE_DIRECTORIES(${ZYPP_INCLUDE_DIR}) +@@ -70,6 +73,9 @@ + INCLUDE(CTest) + ENABLE_TESTING() + ++# New Augeas requires libxml now ++PKG_CHECK_MODULES(LIBXML REQUIRED libxml-2.0) ++INCLUDE_DIRECTORIES( ${LIBXML_INCLUDE_DIRS} ) + + # documentation too important to be hidden in doc: + 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+" LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413" DEPENDS = "libzypp augeas" -PR = "r6" +PR = "r1" SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582" inherit cmake SRC_URI = "git://github.com/openSUSE/zypper.git;protocol=git \ file://cmake.patch \ + file://cmake_libxml2.patch \ file://dso_linking_change_build_fix.patch \ file://rpm5-flag.patch \ " |