diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch | 36 |
1 files changed, 27 insertions, 9 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 index f08bd688f1..b2437a8723 100644 --- a/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch +++ b/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | rpm: compile rpmqv.c instead of rpmqv.cc | 1 | From e8bae261615e19ff8a28683765c9539cfb22a086 Mon Sep 17 00:00:00 2001 |
2 | From: Joe Slater <jslater@windriver.com> | ||
3 | Date: Thu, 17 Jul 2014 18:14:54 -0700 | ||
4 | Subject: [PATCH 1/9] rpm: compile rpmqv.c instead of rpmqv.cc | ||
2 | 5 | ||
3 | Some versions of gcc, 4.4.5 for example, will put a reference to __gxx_personality_v0 | 6 | 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 | 7 | into rpm.o and rpmbuild.o. This means we must link with g++, and the Makefile we |
@@ -10,23 +13,38 @@ Upstream-Status: Inappropriate [other] | |||
10 | 13 | ||
11 | When linking with g++ is really necessary, the upstream package will do that. | 14 | When linking with g++ is really necessary, the upstream package will do that. |
12 | 15 | ||
16 | Also instead of symlinking files in two places, which can and does race in | ||
17 | parallel builds, simply refer to the file's full location [RB] | ||
18 | |||
13 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | 19 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
20 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
21 | |||
22 | --- | ||
23 | Makefile.am | 6 ++---- | ||
24 | 1 file changed, 2 insertions(+), 4 deletions(-) | ||
14 | 25 | ||
26 | diff --git a/Makefile.am b/Makefile.am | ||
27 | index 1dade0a..55f8669 100644 | ||
15 | --- a/Makefile.am | 28 | --- a/Makefile.am |
16 | +++ b/Makefile.am | 29 | +++ b/Makefile.am |
17 | @@ -127,13 +127,13 @@ rpm_SOURCES = build.c | 30 | @@ -201,15 +201,13 @@ rpm_SOURCES = build.c |
18 | rpm_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) | 31 | rpm_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) |
19 | rpm_LDADD = rpm.o $(myLDADD) | 32 | rpm_LDADD = rpm.o $(myLDADD) |
20 | rpm.o: $(top_srcdir)/rpmqv.c | 33 | rpm.o: $(top_srcdir)/rpmqv.c |
21 | - $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.cc | 34 | - ln -sf $< rpmqv.cc |
22 | + $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.c | 35 | - $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c rpmqv.cc |
36 | + $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $^ | ||
23 | 37 | ||
24 | rpmbuild_SOURCES = build.c | 38 | rpmbuild_SOURCES = build.c |
25 | rpmbuild_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) | 39 | rpmbuild_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) |
26 | rpmbuild_LDADD = rpmbuild.o $(myLDADD) | 40 | rpmbuild_LDADD = rpmbuild.o $(myLDADD) |
27 | rpmbuild.o: $(top_srcdir)/rpmqv.c | 41 | rpmbuild.o: $(top_srcdir)/rpmqv.c |
28 | - $(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.cc | 42 | - ln -sf $< rpmqv.cc |
29 | + $(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.c | 43 | - $(COMPILE) -DIAM_RPMBT -o $@ -c rpmqv.cc |
44 | + $(COMPILE) -DIAM_RPMBT -o $@ -c $^ | ||
30 | 45 | ||
31 | .PHONY: splint | 46 | .syntastic_c_config: Makefile |
32 | splint: | 47 | @echo $(COMPILE) | tr ' ' '\n' | sed -e '1d' > $@ |
48 | -- | ||
49 | 2.7.0 | ||
50 | |||