aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-07-02 19:57:44 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-08 11:19:48 +0100
commit0c7b4a5e23836889196f85f472f081d51529e94e (patch)
treef300a95188e10f51ddd30f53ee2eff73e92d41ff /meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
parent04bb223110da2f92725c341bc3ec0cf26325f675 (diff)
downloadopenembedded-core-contrib-0c7b4a5e23836889196f85f472f081d51529e94e.tar.gz
rpm: Upgrade to 5.4.14
Update various patches. A few corrections to the patch descriptions, otherwise simple quilt refresh or conflict resolution. Remove rpm-solvedb.patch and rpm-respect-arch.patch. These are both related to the old solvedb package dependency solver. This is no longer used since we moved to smartpm. rpm-stub-out-git_strerror was a backport and is no longer needed. RPM 5.4.12 and newer normally requires Berkley DB 6.0 or newer. A small patch to configure allows RPM to dynamically select DB 5.3 or DB 6.0 based on what is available at configure time. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch')
-rw-r--r--meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch b/meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
index 0474c65a89..976af486fb 100644
--- a/meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
+++ b/meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
@@ -6,11 +6,11 @@ Therefore we change the compile only check to compile and link check
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
-Index: rpm-5.4.0/configure.ac
+Index: rpm-5.4.14/configure.ac
===================================================================
---- rpm-5.4.0.orig/configure.ac 2012-06-01 11:41:19.741480143 -0700
-+++ rpm-5.4.0/configure.ac 2012-06-01 11:41:51.773481676 -0700
-@@ -193,7 +193,7 @@
+--- rpm-5.4.14.orig/configure.ac
++++ rpm-5.4.14/configure.ac
+@@ -201,7 +201,7 @@ dnl # GNU GCC (usually "gcc")
my_save_cflags="$CFLAGS"
CFLAGS=$c
AC_MSG_CHECKING([whether GCC supports $c])