diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2016-02-23 11:28:21 -0600 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@windriver.com> | 2016-02-29 18:48:45 -0600 |
| commit | dab553a60bc1777cf39c12670e41a3e2095156cd (patch) | |
| tree | 05c807b01b09df8f60abe7490eaed76c116450d1 /meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch | |
| parent | 390bad905537820f49add855c95d726b5b55c8fa (diff) | |
| download | openembedded-core-contrib-dab553a60bc1777cf39c12670e41a3e2095156cd.tar.gz | |
rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head
meta/lib/oe/package_manager.py was also updated. This ensures that any
diagnostic messages are ignored from the output of rpmresolve.
The patches have been split into bug fixes (things that belong upstream)
and local changes that are OE specific.
The following patches are obsolete and have been removed:
rpm-remove-sykcparse-decl.patch
fstack-protector-configure-check.patch
rpm-disable-Wno-override-init.patch
rpm-lua-fix-print.patch
rpm-rpmpgp-fix.patch
verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
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 | 27 |
1 files changed, 16 insertions, 11 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..b3c14fd52e 100644 --- a/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch +++ b/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch @@ -12,21 +12,26 @@ Upstream-Status: Inappropriate [other] 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) +Index: rpm/Makefile.am +=================================================================== +--- rpm.orig/Makefile.am ++++ rpm/Makefile.am +@@ -202,14 +202,16 @@ rpm_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAG 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 + ln -sf $< rpmqv.cc ++ ln -sf $< rpmqv.c +- $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c rpmqv.cc ++ $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c 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 + rpmbuild.o: $(top_srcdir)/rpmqv.c + ln -sf $< rpmqv.cc ++ ln -sf $< rpmqv.c +- $(COMPILE) -DIAM_RPMBT -o $@ -c rpmqv.cc ++ $(COMPILE) -DIAM_RPMBT -o $@ -c rpmqv.c - .PHONY: splint - splint: + .syntastic_c_config: Makefile + @echo $(COMPILE) | tr ' ' '\n' | sed -e '1d' > $@ |