[OE-core] [PATCHv3 6/6] rpm: Fix linking error encountered in rpm-native

[Richard Purdie]

Hi Khem,

On Wed, 2011-03-02 at 22:52 -0800, 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.

This change is fine in itself but I'm going to be a little critical here
since we're just getting going and I want to start as we mean to go on.

Could you add a description of the problem and why the fix is needed to
the patch header please, also adding your name and a date.

The reason why is so in six months time, someone looking at this can
work out a) why the patch is needed, b) Who wrote it so they have some
idea where it came from and who to talk to if they have a question and
c) How long the issue has been around for.

I appreciate some of this info can be got through the SCM but I've yet
to see a good reason for not including it directly in the patch header.

Cheers,

Richard

> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
>  .../rpm/rpm/rpm-tools-mtree-LDFLAGS.patch          |   13 +++++++++++++
>  meta/recipes-devtools/rpm/rpm_5.4.0.bb             |    3 ++-
>  2 files changed, 15 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..347d976
> --- /dev/null
> +++ b/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch
> @@ -0,0 +1,13 @@
> +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 \