diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-03-03 08:09:06 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-03 23:49:20 +0000 |
commit | bd9b65d06d34d9fc8090fe2aeeca6e3724e00f91 (patch) | |
tree | 322919f4679e975026ce793af9e993cb70ca8455 /meta/recipes-devtools/rpm/rpm | |
parent | 18420c41126803a8cb6490664eb004eb7a72207d (diff) | |
download | poky-bd9b65d06d34d9fc8090fe2aeeca6e3724e00f91.tar.gz |
rpm: Fix linking error encountered in rpm-native
* This patch passes the correct LDFLAGS to account for
additional dependencies of librpmio on libbeecrypt and libsyck
and hence fixes the build error.
(From OE-Core rev: bcdd048e4857b5f8a343c434ade5a02ab1db33bc)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch | 24 |
1 files changed, 24 insertions, 0 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 new file mode 100644 index 0000000000..9e7bba0475 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | Source: None | ||
2 | Status: Needs to go Upstream | ||
3 | Author: Khem Raj <raj.khem@gmail.com> | ||
4 | Date: 2011-03-03 | ||
5 | Description: | ||
6 | This patch fixes build issue found when compiling rpm-natibe on ubuntu | ||
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 | ||
9 | in librpmio.so. This patch adds correct flags to mtree_LDADD to account | ||
10 | for rpmio deps | ||
11 | |||
12 | Index: rpm-5.4.0/tools/Makefile.am | ||
13 | =================================================================== | ||
14 | --- rpm-5.4.0.orig/tools/Makefile.am | ||
15 | +++ rpm-5.4.0/tools/Makefile.am | ||
16 | @@ -169,7 +169,7 @@ grep_LDADD = $(RPMIO_LDADD_COMMON) | ||
17 | |||
18 | mtree_SOURCES = rpmmtree.c | ||
19 | mtree_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) | ||
20 | -mtree_LDADD = $(RPM_LDADD_COMMON) | ||
21 | +mtree_LDADD = $(RPMIO_LDADD_COMMON) | ||
22 | |||
23 | rpmrepo_SOURCES = rpmrepo.c | ||
24 | rpmrepo_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/scripts -I$(top_builddir)/scripts $(CPPFLAGS) | ||