Attachment 95264 Details for Bug 75858 – Hack pkgconfig files to be more MinGW-friendly

[patch] Hack pkgconfig files to be more MinGW-friendly

0003-Hack-pkgconfig-files-to-be-more-MinGW-friendly.patch (text/plain), 3.12 KB, created by LRN on 2014-03-07 00:13:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: LRN

Created: 2014-03-07 00:13:30 UTC

Size: 3.12 KB

patch

obsolete

>From 481fec5476c7e674c1b9fec999e7f698e96155d5 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
> =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
>Date: Thu, 6 Mar 2014 23:11:12 +0000
>Subject: [PATCH 3/9] Hack pkgconfig files to be more MinGW-friendly
>
>https://bugs.freedesktop.org/show_bug.cgi?id=75858
>---
> configure.ac             | 15 +++++++++++++++
> dbus-1-uninstalled.pc.in | 10 +++++-----
> dbus-1.pc.in             | 10 +++++-----
> 3 files changed, 25 insertions(+), 10 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 13d1c87..a970b8e 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -1451,6 +1451,21 @@ AM_CONDITIONAL(DBUS_CAN_UPLOAD_DOCS,
> #### find the actual value for $prefix that we'll end up with
> ##   (I know this is broken and should be done in the Makefile, but
> ##    that's a major pain and almost nobody actually seems to care)
>+UNEXPANDED_PREFIX="$prefix"
>+UNEXPANDED_LOCALSTATEDIR="$localstatedir"
>+UNEXPANDED_SYSCONFDIR="$sysconfdir"
>+UNEXPANDED_BINDIR="$bindir"
>+UNEXPANDED_LIBDIR="$libdir"
>+UNEXPANDED_LIBEXECDIR="$libexecdir"
>+UNEXPANDED_DATADIR="$datadir"
>+AC_SUBST(UNEXPANDED_PREFIX)
>+AC_SUBST(UNEXPANDED_LOCALSTATEDIR)
>+AC_SUBST(UNEXPANDED_SYSCONFDIR)
>+AC_SUBST(UNEXPANDED_BINDIR)
>+AC_SUBST(UNEXPANDED_LIBDIR)
>+AC_SUBST(UNEXPANDED_LIBEXECDIR)
>+AC_SUBST(UNEXPANDED_DATADIR)
>+
> AS_AC_EXPAND(EXPANDED_PREFIX, "$prefix")
> AS_AC_EXPAND(EXPANDED_LOCALSTATEDIR, "$localstatedir")
> AS_AC_EXPAND(EXPANDED_SYSCONFDIR, "$sysconfdir")
>diff --git a/dbus-1-uninstalled.pc.in b/dbus-1-uninstalled.pc.in
>index 038c83e..14c3bef 100644
>--- a/dbus-1-uninstalled.pc.in
>+++ b/dbus-1-uninstalled.pc.in
>@@ -3,11 +3,11 @@ abs_top_srcdir=@abs_top_srcdir@
> prefix=
> exec_prefix=
> system_bus_default_address=@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
>-sysconfdir=@EXPANDED_SYSCONFDIR@
>-session_bus_services_dir=@EXPANDED_DATADIR@/dbus-1/services
>-system_bus_services_dir=@EXPANDED_DATADIR@/dbus-1/system-services
>-interfaces_dir=@EXPANDED_DATADIR@/dbus-1/interfaces
>-daemondir=@DBUS_DAEMONDIR@
>+sysconfdir=@sysconfdir@
>+session_bus_services_dir=@UNEXPANDED_DATADIR@/dbus-1/services
>+system_bus_services_dir=@UNEXPANDED_DATADIR@/dbus-1/system-services
>+interfaces_dir=@UNEXPANDED_DATADIR@/dbus-1/interfaces
>+daemondir=${exec_prefix}/bin
> 
> Name: dbus
> Description: Free desktop message bus (uninstalled copy)
>diff --git a/dbus-1.pc.in b/dbus-1.pc.in
>index 25f8bce..73a7faa 100644
>--- a/dbus-1.pc.in
>+++ b/dbus-1.pc.in
>@@ -3,11 +3,11 @@ exec_prefix=@exec_prefix@
> libdir=@libdir@
> includedir=@includedir@
> system_bus_default_address=@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
>-sysconfdir=@EXPANDED_SYSCONFDIR@
>-session_bus_services_dir=@EXPANDED_DATADIR@/dbus-1/services
>-system_bus_services_dir=@EXPANDED_DATADIR@/dbus-1/system-services
>-interfaces_dir=@EXPANDED_DATADIR@/dbus-1/interfaces
>-daemondir=@DBUS_DAEMONDIR@
>+sysconfdir=@sysconfdir@
>+session_bus_services_dir=@UNEXPANDED_DATADIR@/dbus-1/services
>+system_bus_services_dir=@UNEXPANDED_DATADIR@/dbus-1/system-services
>+interfaces_dir=@UNEXPANDED_DATADIR@/dbus-1/interfaces
>+daemondir=${exec_prefix}/bin
> 
> Name: dbus
> Description: Free desktop message bus
>-- 
>1.8.4
>

Actions: View | Splinter Review

Attachments on bug 75858: 95264 | 95265 | 95341 | 95342 | 95349 | 95944 | 98131 | 98256

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.