summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2014-07-17 18:14:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-19 00:08:59 +0100
commit779f845469370f4487c324fe5b9260355f07897f (patch)
treeaedab17beeeea6deff005de051f64c435a3e5bba /meta/recipes-devtools
parent6cb4ba9508f9e6cba89639005c047f8249a41c5f (diff)
downloadpoky-779f845469370f4487c324fe5b9260355f07897f.tar.gz
rpm: compile rpmqv.c instead of rpmqv.cc
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). (From OE-Core rev: a36327ee2d159b3791cc6ce0c36af4b9e0693e51) Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch32
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.14.bb1
2 files changed, 33 insertions, 0 deletions
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 0000000000..f08bd688f1
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch
@@ -0,0 +1,32 @@
1rpm: compile rpmqv.c instead of rpmqv.cc
2
3Some versions of gcc, 4.4.5 for example, will put a reference to __gxx_personality_v0
4into rpm.o and rpmbuild.o. This means we must link with g++, and the Makefile we
5generate does not.
6
7So, go back to using rpmqv.c (which is currently identical to rpmqv.cc).
8
9Upstream-Status: Inappropriate [other]
10
11 When linking with g++ is really necessary, the upstream package will do that.
12
13Signed-off-by: Joe Slater <joe.slater@windriver.com>
14
15--- a/Makefile.am
16+++ b/Makefile.am
17@@ -127,13 +127,13 @@ rpm_SOURCES = build.c
18 rpm_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
19 rpm_LDADD = rpm.o $(myLDADD)
20 rpm.o: $(top_srcdir)/rpmqv.c
21- $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.cc
22+ $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.c
23
24 rpmbuild_SOURCES = build.c
25 rpmbuild_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
26 rpmbuild_LDADD = rpmbuild.o $(myLDADD)
27 rpmbuild.o: $(top_srcdir)/rpmqv.c
28- $(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.cc
29+ $(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.c
30
31 .PHONY: splint
32 splint:
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
index 15c1738ac7..8fec6565c9 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
92 file://rpm-fix-logio-cp.patch \ 92 file://rpm-fix-logio-cp.patch \
93 file://rpm-db5-or-db6.patch \ 93 file://rpm-db5-or-db6.patch \
94 file://rpm-disable-Wno-override-init.patch \ 94 file://rpm-disable-Wno-override-init.patch \
95 file://rpmqv_cc_b_gone.patch \
95 " 96 "
96 97
97# Uncomment the following line to enable platform score debugging 98# Uncomment the following line to enable platform score debugging