mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-09 16:59:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

rpm: add version 4.11.2

Browse Source 
add patch to remove db3 from configure.ac
add inherit pkgconfig

(From OE-Core rev: 9a17f938e738a16a1ef9a00be6a8317d71f92573)

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
2014-09-30 10:16:54 -07:00
committed by Richard Purdie
parent 6be3386e78
commit 58d9c4e4ba
10 changed files with 876 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
meta/recipes-devtools/rpm/rpm-4.11.2/use-pkgconfig-for-python.patch Normal file
View File

@@ -0,0 +1,38 @@
Use pkgconfig to get the correct include paths
Upstream-Status: Pending
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ronan Le Martret <ronan.lemartret@open.eurogiciel.org>
diff --git a/configure.ac b/configure.ac
index e97f727..8179f44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -540,10 +540,10 @@ esac],
AS_IF([test "$enable_python" = yes],[
AM_PATH_PYTHON([2.6],[
- WITH_PYTHON_INCLUDE=`${PYTHON} -c 'from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_inc())'`
+ WITH_PYTHON_INCLUDE=$(${PKG_CONFIG} --cflags-only-I python)
WITH_PYTHON_SUBPACKAGE=1
save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -I$WITH_PYTHON_INCLUDE"
+ CPPFLAGS="$CPPFLAGS $WITH_PYTHON_INCLUDE"
AC_CHECK_HEADER([Python.h],[],
[AC_MSG_ERROR([missing Python.h])
])
diff --git a/python/Makefile.am b/python/Makefile.am
index fff51ae..f37cb9d 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -4,7 +4,7 @@ EXTRA_DIST = rpm/__init__.py rpm/transaction.py
AM_CPPFLAGS = -I$(top_builddir)/include/
AM_CPPFLAGS += -I$(top_srcdir)/python
-AM_CPPFLAGS += -I@WITH_PYTHON_INCLUDE@
+AM_CPPFLAGS += @WITH_PYTHON_INCLUDE@
pkgpyexec_LTLIBRARIES = _rpmmodule.la _rpmbmodule.la _rpmsmodule.la
pkgpyexec_DATA = rpm/__init__.py rpm/transaction.py