Re: [PATCHv4 6/6] rpm: Fix linking error encountered in rpm-native

[Mark Hatle <mark.hatle@windriver.com>]

This looks good to me.  I'll try to push it back upstream as well.

--Mark

On 3/3/11 10:09 AM, Khem Raj wrote:
> * This patch passes the correct LDFLAGS to account for
>   additional dependencies of librpmio on libbeecrypt and libsyck
>   and hence fixes the build error.
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../rpm/rpm/rpm-tools-mtree-LDFLAGS.patch          |   24 ++++++++++++++++++++
>  meta/recipes-devtools/rpm/rpm_5.4.0.bb             |    3 +-
>  2 files changed, 26 insertions(+), 1 deletions(-)
>  create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch
> 
> 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 0000000..9e7bba0
> --- /dev/null
> +++ b/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch
> @@ -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)
> diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
> index 0003f48..3704816 100644
> --- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
> +++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
> @@ -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 \