mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

rpm: Fix linking error encountered in rpm-native

Browse Source 
* 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>
This commit is contained in:
Khem Raj
2011-03-03 08:09:06 -08:00
committed by Richard Purdie
parent 18420c4112
commit bd9b65d06d
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch Normal file
View File

@@ -0,0 +1,24 @@
Source: None
Status: Needs to go Upstream
Author: Khem Raj <raj.khem@gmail.com>
Date: 2011-03-03
Description:
This patch fixes build issue found when compiling rpm-natibe on ubuntu
11.04-alpha. Problem is that linker does not get correct set of dependent
libraries when linking mtree binary which results in undefined symbols
in librpmio.so. This patch adds correct flags to mtree_LDADD to account
for rpmio deps
Index: rpm-5.4.0/tools/Makefile.am
===================================================================
--- rpm-5.4.0.orig/tools/Makefile.am
+++ rpm-5.4.0/tools/Makefile.am
@@ -169,7 +169,7 @@ grep_LDADD = $(RPMIO_LDADD_COMMON)
mtree_SOURCES = rpmmtree.c
mtree_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
-mtree_LDADD = $(RPM_LDADD_COMMON)
+mtree_LDADD = $(RPMIO_LDADD_COMMON)
rpmrepo_SOURCES = rpmrepo.c
rpmrepo_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/scripts -I$(top_builddir)/scripts $(CPPFLAGS)

3
meta/recipes-devtools/rpm/rpm_5.4.0.bb
View File

@@ -43,7 +43,7 @@ LICENSE = "LGPL 2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "bzip2 zlib python perl db openssl elfutils expat libpcre attr acl popt"
PR = "r13"
PR = "r14"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -56,6 +56,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex
file://rpm-showrc.patch \
file://rpm-nofsync.patch \
file://rpm-solvedb.patch \
file://rpm-tools-mtree-LDFLAGS.patch \
"
# file://hdraddorappend.patch \