Attachment 134566 Details for Bug 34905 – build: Remove unused substitution DBUS_PATH_OR_ABSTRACT

[patch] build: Remove unused substitution DBUS_PATH_OR_ABSTRACT

0004-build-Remove-unused-substitution-DBUS_PATH_OR_ABSTRA.patch (text/plain), 2.21 KB, created by Simon McVittie on 2017-09-29 12:12:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-09-29 12:12:33 UTC

Size: 2.21 KB

patch

obsolete

>From 28d5eda862e7bdaec6856343bccd27f1e7be3108 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Fri, 29 Sep 2017 12:18:25 +0100
>Subject: [PATCH 4/5] build: Remove unused substitution DBUS_PATH_OR_ABSTRACT
>
>This was presumably once used in constructs like
>"unix:" DBUS_PATH_OR_ABSTRACT "=/var/run/dbus/foo", but git grep says
>there are no remaining uses, so it can go.
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> cmake/ConfigureChecks.cmake |  7 -------
> cmake/config.h.cmake        | 10 ----------
> configure.ac                | 11 -----------
> 3 files changed, 28 deletions(-)
>
>diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
>index 119b83e6..6815178b 100644
>--- a/cmake/ConfigureChecks.cmake
>+++ b/cmake/ConfigureChecks.cmake
>@@ -177,10 +177,3 @@ if (DBUS_ENABLE_ABSTRACT_SOCKETS)
>               ${CMAKE_SOURCE_DIR}/modules/CheckForAbstractSockets.c)
> 
> endif(DBUS_ENABLE_ABSTRACT_SOCKETS)
>-
>-if(HAVE_ABSTRACT_SOCKETS)
>-  set(DBUS_PATH_OR_ABSTRACT_VALUE abstract)
>-else(HAVE_ABSTRACT_SOCKETS)
>-  set(DBUS_PATH_OR_ABSTRACT_VALUE path)
>-endif(HAVE_ABSTRACT_SOCKETS)
>-
>diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
>index 361d0b0d..154353b7 100644
>--- a/cmake/config.h.cmake
>+++ b/cmake/config.h.cmake
>@@ -53,16 +53,6 @@
> 
> #cmakedefine HAVE_ABSTRACT_SOCKETS 1
> 
>-#cmakedefine DBUS_PATH_OR_ABSTRACT_VALUE 1
>-
>-#if (defined DBUS_PATH_OR_ABSTRACT_VALUE)
>-#define DBUS_PATH_OR_ABSTRACT @DBUS_PATH_OR_ABSTRACT_VALUE@
>-#endif
>-
>-#ifdef DBUS_PATH_OR_ABSTRACT_VALUE
>-#undef DBUS_PATH_OR_ABSTRACT_VALUE
>-#endif
>-
> /* selinux */
> /* kqueue */
> #cmakedefine HAVE_CONSOLE_OWNER_FILE 1
>diff --git a/configure.ac b/configure.ac
>index 8ab159b4..98ee1bcf 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -919,17 +919,6 @@ if test x$enable_abstract_sockets = xno; then
>    ac_cv_have_abstract_sockets=no;
> fi
> 
>-if test x$ac_cv_have_abstract_sockets = xyes ; then
>-   DBUS_PATH_OR_ABSTRACT=abstract
>-   AC_DEFINE(HAVE_ABSTRACT_SOCKETS,1,[Have abstract socket namespace])
>-else
>-   DBUS_PATH_OR_ABSTRACT=path
>-fi
>-
>-# this is used in addresses to prefer abstract, e.g.
>-# unix:path=/foo or unix:abstract=/foo
>-AC_SUBST(DBUS_PATH_OR_ABSTRACT)
>-
> PKG_CHECK_MODULES([EXPAT], [expat])
> 
> save_cflags="$CFLAGS"
>-- 
>2.14.2
>

Actions: View | Splinter Review

Attachments on bug 34905: 90398 | 134566 | 134567

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.