summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/zypper/zypper/cmake.patch
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-01-23 12:10:10 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-24 20:09:00 +0000
commite90fad58faf9e25479158359c528999b09be1a02 (patch)
tree4e50bee32d6e74ea37a9c37f9c7cb3e606354780 /meta/recipes-extended/zypper/zypper/cmake.patch
parent1f8f6fe4eb6884ac3a254d4ef54c7841e407ecab (diff)
downloadpoky-e90fad58faf9e25479158359c528999b09be1a02.tar.gz
zypper: remove
Functionality provided by Zypper is now covered more effectively by Smart (python-smartpm) which is now being used for package management on the target when enabled and RPM packaging is selected. Fixes [YOCTO #3349]. (From OE-Core rev: cc866433341532a0b5cf8cd5f67998960ea96499) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/zypper/zypper/cmake.patch')
-rw-r--r--meta/recipes-extended/zypper/zypper/cmake.patch22
1 files changed, 0 insertions, 22 deletions
diff --git a/meta/recipes-extended/zypper/zypper/cmake.patch b/meta/recipes-extended/zypper/zypper/cmake.patch
deleted file mode 100644
index 8312a97dc9..0000000000
--- a/meta/recipes-extended/zypper/zypper/cmake.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3without the patch, /usr/include/rpm/ won't be added
4in cppflags
5
68/19/2010 - created by Qing He <qing.he@intel.com>
7
8diff --git a/CMakeLists.txt b/CMakeLists.txt
9index 6b040a6..04a1595 100644
10--- a/CMakeLists.txt
11+++ b/CMakeLists.txt
12@@ -21,6 +21,10 @@ SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O2 -Wall -fstack-protector" )
13
14 GENERATE_PACKAGING(${PACKAGE} ${VERSION})
15
16+FIND_PACKAGE(PkgConfig REQUIRED)
17+PKG_CHECK_MODULES(RPM REQUIRED rpm)
18+INCLUDE_DIRECTORIES( ${RPM_INCLUDE_DIRS} )
19+
20 FIND_PACKAGE( Zypp REQUIRED )
21 IF( ZYPP_FOUND )
22 INCLUDE_DIRECTORIES(${ZYPP_INCLUDE_DIR})