diff options
| author | Joe Slater <jslater@windriver.com> | 2014-07-17 18:14:54 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-19 00:08:47 +0100 |
| commit | a36327ee2d159b3791cc6ce0c36af4b9e0693e51 (patch) | |
| tree | b58cb71863e5c6cf3c0159741f2c091e757ca39d /meta | |
| parent | 66293fe13e25bb7a946db5a4b337d5bfcb015091 (diff) | |
| download | openembedded-core-a36327ee2d159b3791cc6ce0c36af4b9e0693e51.tar.gz openembedded-core-a36327ee2d159b3791cc6ce0c36af4b9e0693e51.tar.bz2 openembedded-core-a36327ee2d159b3791cc6ce0c36af4b9e0693e51.zip | |
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).
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.14.bb | 1 |
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 @@ +rpm: compile rpmqv.c instead of rpmqv.cc + +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). + +Upstream-Status: Inappropriate [other] + + When linking with g++ is really necessary, the upstream package will do that. + +Signed-off-by: Joe Slater <joe.slater@windriver.com> + +--- 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 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 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 |