From 9972fabafb5af3eb4fb742a3324165beacb04f1d Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 1 Jun 2011 17:04:27 +0100 Subject: [PATCH 1/5] add a release name here too --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 6ee76fef..b4009fa8 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ D-Bus 1.4.10 (2011-06-01) == +The "Ape Ale" release. + Notes for distributors: This version of D-Bus no longer uses -fPIE by default. Distributions wishing From 638a742a383f4207dcfa9d39498958f2f1ae02b1 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 1 Jun 2011 18:36:16 +0100 Subject: [PATCH 2/5] Use #!/bin/sh for run-with-tmp-session-bus.sh It doesn't seem to have any bashisms, and bash isn't in /bin on *BSD. Suggested by Timothy Redaelli. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35880 --- tools/run-with-tmp-session-bus.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/run-with-tmp-session-bus.sh b/tools/run-with-tmp-session-bus.sh index 982184a2..c39999fb 100755 --- a/tools/run-with-tmp-session-bus.sh +++ b/tools/run-with-tmp-session-bus.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#! /bin/sh SCRIPTNAME=$0 WRAPPED_SCRIPT=$1 From add71e5d7a5f14afedc8796dae793c17537a71f4 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 1 Jun 2011 23:51:21 +0200 Subject: [PATCH 3/5] don't try to build dbus-daemon-launch-helper for Windows Fixed regression in b0acded which breaks build for Windows. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37838 Reviewed-by: Simon McVittie --- bus/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bus/Makefile.am b/bus/Makefile.am index dfb3bc34..73765f5f 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -150,7 +150,9 @@ bus_test_launch_helper_CPPFLAGS= -DDBUS_STATIC_BUILD \ ## even when not doing "make check" noinst_PROGRAMS = $(TESTS) dbus_daemon_exec_PROGRAMS = dbus-daemon +if DBUS_UNIX libexec_PROGRAMS = dbus-daemon-launch-helper +endif DBUS_UNIX ## note that TESTS has special meaning (stuff to use in make check) ## so if adding tests not to be run in make check, don't add them to From ff2047a75aa573ac898cb8b577b7c49a2b707fb6 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 6 Jun 2011 09:59:37 +0100 Subject: [PATCH 4/5] Remove support for -Wl,--gc-sections altogether Packagers should only enable this flag if they have confirmed that it actually works on their toolchain (it's the sort of rarely used feature that frequently regresses on obscure architectures/OSs without anyone noticing), and also confirmed that it is actually a significant size win for their configuration. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33466 Reviewed-by: Colin Walters --- bus/Makefile.am | 8 ++++---- configure.ac | 28 ---------------------------- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/bus/Makefile.am b/bus/Makefile.am index 73765f5f..bb895e2a 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -89,7 +89,7 @@ dbus_daemon_LDADD= \ $(EFENCE) \ $(DBUS_BUS_LIBS) -dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ +dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ LAUNCH_HELPER_SOURCES= \ $(XML_SOURCES) \ @@ -115,7 +115,7 @@ dbus_daemon_launch_helper_LDADD= \ $(top_builddir)/dbus/libdbus-internal.la \ $(DBUS_LAUNCHER_LIBS) -dbus_daemon_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ +dbus_daemon_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ ## we build another binary so we can do the launch testing without root privs. ## DO NOT INSTALL THIS FILE @@ -127,7 +127,7 @@ dbus_daemon_launch_helper_test_LDADD= \ $(top_builddir)/dbus/libdbus-internal.la \ $(DBUS_LAUNCHER_LIBS) -dbus_daemon_launch_helper_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ +dbus_daemon_launch_helper_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ dbus_daemon_launch_helper_test_CPPFLAGS= -DDBUS_STATIC_BUILD \ -DACTIVATION_LAUNCHER_TEST @@ -141,7 +141,7 @@ bus_test_launch_helper_LDADD= \ $(top_builddir)/dbus/libdbus-internal.la \ $(DBUS_LAUNCHER_LIBS) -bus_test_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ +bus_test_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ bus_test_launch_helper_CPPFLAGS= -DDBUS_STATIC_BUILD \ -DACTIVATION_LAUNCHER_TEST \ -DACTIVATION_LAUNCHER_DO_OOM diff --git a/configure.ac b/configure.ac index a041c55f..64db5423 100644 --- a/configure.ac +++ b/configure.ac @@ -1168,34 +1168,6 @@ dnl but prepending to CFLAGS (so the user can override it with later CFLAGS) dnl is the next best thing CFLAGS="$WARNING_CFLAGS $CFLAGS" -# Disabling gc-sections makes our binaries bigger, but some toolchains -# have known-broken support for it which discards sections that are needed. -# See https://bugs.freedesktop.org/show_bug.cgi?id=33466 -SECTION_LDFLAGS= -AC_ARG_ENABLE([gc-sections], - [AS_HELP_STRING([--disable-gc-sections], - [disable --gc-sections to work around broken toolchains])], - [enable_gc_sections=$enableval], - [enable_gc_sections=yes]) -if test "x$GCC,$enable_gc_sections,$dbus_win" = xyes,yes,no; then - save_CFLAGS="$CFLAGS" - save_LDFLAGS="$LDFLAGS" - AC_MSG_CHECKING([for ability to link with --gc-sections]) - CFLAGS="-ffunction-sections -fdata-sections" - LDFLAGS="-Wl,--gc-sections" - AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], - [rc=yes], - [rc=no]) - AC_MSG_RESULT([$rc]) - CFLAGS="$save_CFLAGS" - LDFLAGS="$save_LDFLAGS" - if test "x$rc" = xyes; then - SECTION_LDFLAGS="-Wl,--gc-sections" - CFLAGS="-ffunction-sections -fdata-sections $CFLAGS" - fi -fi -AC_SUBST([SECTION_LDFLAGS]) - case $host_os in solaris*) # Solaris' C library apparently needs these runes to be threadsafe... From f0d4e0fc974e642f54aaf58907db8d5284d9013d Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 7 Jun 2011 14:36:15 +0100 Subject: [PATCH 5/5] NEWS --- NEWS | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/NEWS b/NEWS index b4009fa8..d0b3420c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,20 @@ +D-Bus 1.4.12 (UNRELEASED) +== + +Changes: + +• Don't use -Wl,--gc-sections by default: in practice the size decrease is + small (300KiB on x86-64) and it frequently doesn't work in unusual + toolchains. To optimize for minimum installed size, you should benchmark + various possibilities for CFLAGS and LDFLAGS, and set the best flags for + your particular toolchain at configure time. (fd.o #33466, Simon McVittie) + +• Use #!/bin/sh for run-with-tmp-session-bus.sh, making it work on *BSD + (fd.o #35880, Timothy Redaelli) + +• Windows-specific changes: + · don't try to build dbus-daemon-launch-helper (fd.o #37838, Mark Brand) + D-Bus 1.4.10 (2011-06-01) ==