[OE-core] (resending) [oe-core][PATCH 1/1] rpm: compile rpmqv.c instead of rpmqv.cc

[Saul Wold]

On 07/16/2014 11:40 AM, Joe Slater wrote:
> Some versions of gcc will put a reference to __gxx_personality_v0
> into rpm.o and rpmbuild.o.  This means we must link using g++,
> and Makefile does not.
>
> Go back to using rpmqv.c (which is currently identical to rpmqv.cc).
>
> Signed-off-by: Joe Slater <jslater at windriver.com>
> ---
>   .../recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch |   25 ++++++++++++++++++++
>   meta/recipes-devtools/rpm/rpm_5.4.14.bb            |    1 +
>   2 files changed, 26 insertions(+), 0 deletions(-)
>   create mode 100644 meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch
>
> diff --git a/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch b/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch
> new file mode 100644
> index 0000000..0996448
> --- /dev/null
> +++ b/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch
> @@ -0,0 +1,25 @@
> +

Patch needs Signed-off-by: and Upstream-Status tags please

Thanks
	Sau!

> +Some versions of gcc, 4.4.5 for example, will put a reference to __gxx_personality_v0
> +into rpm.o and rpmbuild.o.  This means we must link with g++, and the Makefile we
> +generate does not.
> +
> +So, go back to using rpmqv.c (which is currently identical to rpmqv.cc).
> +
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -127,13 +127,13 @@ rpm_SOURCES =		build.c
> + rpm_LDFLAGS =		@LDFLAGS_STATIC@ $(LDFLAGS)
> + rpm_LDADD =		rpm.o $(myLDADD)
> + rpm.o:	$(top_srcdir)/rpmqv.c
> +-	$(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.cc
> ++	$(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.c
> +
> + rpmbuild_SOURCES =	build.c
> + rpmbuild_LDFLAGS =	@LDFLAGS_STATIC@ $(LDFLAGS)
> + rpmbuild_LDADD =	rpmbuild.o $(myLDADD)
> + rpmbuild.o: $(top_srcdir)/rpmqv.c
> +-	$(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.cc
> ++	$(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.c
> +
> + .PHONY:	splint
> + splint:
> diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
> index 15c1738..8fec656 100644
> --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb
> +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
> @@ -92,6 +92,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e
>   	   file://rpm-fix-logio-cp.patch \
>   	   file://rpm-db5-or-db6.patch \
>   	   file://rpm-disable-Wno-override-init.patch \
> +	   file://rpmqv_cc_b_gone.patch \
>   	  "
>
>   # Uncomment the following line to enable platform score debugging
>