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>
This commit is contained in:
Saul Wold 2011-12-20 15:22:56 -08:00 committed by Richard Purdie
parent 05eabde3e4
commit b917222da5
2 changed files with 30 additions and 1 deletions

View File

@ -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(

View File

@ -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 \
"