diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2014-07-02 19:57:44 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-08 11:20:12 +0100 |
commit | fe483ca37c33ebfe4c3e391244c47969e1560aeb (patch) | |
tree | 4b703d42ad5b4c22f9075463c013e562ab649345 /meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch | |
parent | 107ef516a6b5dc8f6e4606d30e8fa204d75f0b21 (diff) | |
download | poky-fe483ca37c33ebfe4c3e391244c47969e1560aeb.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.
(From OE-Core rev: 0c7b4a5e23836889196f85f472f081d51529e94e)
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/rpm-tools-mtree-LDFLAGS.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch b/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch index dd8d8bd5de..cb85bebfc0 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch | |||
@@ -3,17 +3,17 @@ Upstream-Status: Pending | |||
3 | Author: Khem Raj <raj.khem@gmail.com> | 3 | Author: Khem Raj <raj.khem@gmail.com> |
4 | Date: 2011-03-03 | 4 | Date: 2011-03-03 |
5 | Description: | 5 | Description: |
6 | This patch fixes build issue found when compiling rpm-natibe on ubuntu | 6 | This patch fixes build issue found when compiling rpm-native on ubuntu |
7 | 11.04-alpha. Problem is that linker does not get correct set of dependent | 7 | 11.04-alpha. Problem is that linker does not get correct set of dependent |
8 | libraries when linking mtree binary which results in undefined symbols | 8 | libraries when linking mtree binary which results in undefined symbols |
9 | in librpmio.so. This patch adds correct flags to mtree_LDADD to account | 9 | in librpmio.so. This patch adds correct flags to mtree_LDADD to account |
10 | for rpmio deps | 10 | for rpmio deps |
11 | 11 | ||
12 | Index: rpm-5.4.0/tools/Makefile.am | 12 | Index: rpm-5.4.14/tools/Makefile.am |
13 | =================================================================== | 13 | =================================================================== |
14 | --- rpm-5.4.0.orig/tools/Makefile.am | 14 | --- rpm-5.4.14.orig/tools/Makefile.am |
15 | +++ rpm-5.4.0/tools/Makefile.am | 15 | +++ rpm-5.4.14/tools/Makefile.am |
16 | @@ -169,7 +169,7 @@ grep_LDADD = $(RPMIO_LDADD_COMMON) | 16 | @@ -186,7 +186,7 @@ grep_LDADD = $(RPMIO_LDADD_COMMON) |
17 | 17 | ||
18 | mtree_SOURCES = rpmmtree.c | 18 | mtree_SOURCES = rpmmtree.c |
19 | mtree_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) | 19 | mtree_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) |