summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2018-09-06 12:29:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-06 23:43:34 +0100
commit4e4fc46589762914f10ae2fa41b614bcb32f9bb9 (patch)
tree8b4b335ff1629126e1d70427b8471934d32a0c2d /meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch
parentdff0e6de970bb4c858c22874ea19328c670a4ad6 (diff)
downloadopenembedded-core-4e4fc46589762914f10ae2fa41b614bcb32f9bb9.tar.gz
rpm: update to 4.14.2
Drop --disable-dbus option and patch: --disable-plugins is sufficient. Drop upstreamed patches. Drop a chunk of 0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch, as upstream fixed the issue. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch')
-rw-r--r--meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch b/meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch
deleted file mode 100644
index dc71d9b18b..0000000000
--- a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From dfb422c744fdc1838afc40b8e1f161bb46093d92 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Sun, 8 Apr 2018 12:06:42 +0800
-Subject: [PATCH] configure.ac: add option for dbus
-
-Add option for dbus so that users could choose to build with dbus
-or with no dbus.
-
-Upstream-Status: Pending
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- configure.ac | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4db15c7909..493f393d31 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -976,12 +976,15 @@ AS_IF([test "$enable_plugins" = yes],[
- ])
- AM_CONDITIONAL(ENABLE_PLUGINS,[test "$enable_plugins" = yes])
-
--with_dbus=no
--AS_IF([test "$enable_plugins" != no],[
-+AC_ARG_WITH([dbus], [AS_HELP_STRING([--with-dbus], [build with dbus support])],
-+ [],
-+ [with_dbus=yes])
-+
-+AS_IF([test "$with_dbus" != no],[
- PKG_CHECK_MODULES([DBUS],
- [dbus-1 >= 1.3],
-- [AC_DEFINE(DBUS, 1, [Build with dbus support?]) with_dbus=yes],
-- [with_dbus=no])
-+ [AC_DEFINE(DBUS, 1, [Build with dbus support?])],
-+ [AC_MSG_ERROR([dbus not present (--without-dbus to disable)])])
- AC_SUBST(DBUS_CFLAGS)
- AC_SUBST(DBUS_LIBS)
- ])
---
-2.11.0
-