diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch | 32 |
1 files changed, 32 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 @@ | |||
1 | rpm: compile rpmqv.c instead of rpmqv.cc | ||
2 | |||
3 | Some versions of gcc, 4.4.5 for example, will put a reference to __gxx_personality_v0 | ||
4 | into rpm.o and rpmbuild.o. This means we must link with g++, and the Makefile we | ||
5 | generate does not. | ||
6 | |||
7 | So, go back to using rpmqv.c (which is currently identical to rpmqv.cc). | ||
8 | |||
9 | Upstream-Status: Inappropriate [other] | ||
10 | |||
11 | When linking with g++ is really necessary, the upstream package will do that. | ||
12 | |||
13 | Signed-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: | ||