[Pkg-utopia-commits] r3167 - in /packages/unstable/dbus/debian: changelog patches/30_rt-as-needed.patch patches/series

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Thu Jul 16 00:02:46 UTC 2009 

Author: biebl
Date: Thu Jul 16 00:02:32 2009
New Revision: 3167

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3167
Log:
* debian/patches/30_rt-as-needed.patch
  - Fix spurious build failures on alpha and ia64 when using -Wl,--as-needed
    by changing the link order of libdbus-convenience.la and -lrt.

Added:
    packages/unstable/dbus/debian/patches/30_rt-as-needed.patch
Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/patches/series

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=3167&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Thu Jul 16 00:02:32 2009
@@ -5,6 +5,9 @@
   * debian/patches/20_kbsd_cmsgcred.patch
     - Fix incorrect usage of cmsgcred on kFreeBSD. Thanks to Aurelien Jarno
       for the patch.
+  * debian/patches/30_rt-as-needed.patch
+    - Fix spurious build failures on alpha and ia64 when using -Wl,--as-needed
+      by changing the link order of libdbus-convenience.la and -lrt.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 16 Jul 2009 01:43:46 +0200
 

Added: packages/unstable/dbus/debian/patches/30_rt-as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/patches/30_rt-as-needed.patch?rev=3167&op=file
==============================================================================
--- packages/unstable/dbus/debian/patches/30_rt-as-needed.patch (added)
+++ packages/unstable/dbus/debian/patches/30_rt-as-needed.patch Thu Jul 16 00:02:32 2009
@@ -1,0 +1,144 @@
+diff --git a/bus/Makefile.am b/bus/Makefile.am
+index 3b4f69d..ad49e6d 100644
+--- a/bus/Makefile.am
++++ b/bus/Makefile.am
+@@ -78,8 +78,8 @@ dbus_daemon_SOURCES=				\
+ 
+ dbus_daemon_LDADD=					\
+ 	$(EFENCE)					\
+-	$(DBUS_BUS_LIBS)				\
+-	$(top_builddir)/dbus/libdbus-convenience.la
++	$(top_builddir)/dbus/libdbus-convenience.la	\
++	$(DBUS_BUS_LIBS)
+ 
+ dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
+ 
+@@ -103,8 +103,8 @@ dbus_daemon_launch_helper_SOURCES=		\
+ 	$(LAUNCH_HELPER_SOURCES)
+ 
+ dbus_daemon_launch_helper_LDADD=		\
+-	$(DBUS_LAUNCHER_LIBS)			\
+-	$(top_builddir)/dbus/libdbus-convenience.la
++	$(top_builddir)/dbus/libdbus-convenience.la \
++	$(DBUS_LAUNCHER_LIBS)
+ 
+ dbus_daemon_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ 
+@@ -115,8 +115,8 @@ dbus_daemon_launch_helper_test_SOURCES=		\
+ 	$(LAUNCH_HELPER_SOURCES)
+ 
+ dbus_daemon_launch_helper_test_LDADD=		\
+-	$(DBUS_LAUNCHER_LIBS)			\
+-	$(top_builddir)/dbus/libdbus-convenience.la
++	$(top_builddir)/dbus/libdbus-convenience.la \
++	$(DBUS_LAUNCHER_LIBS)
+ 
+ dbus_daemon_launch_helper_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ dbus_daemon_launch_helper_test_CPPFLAGS=	\
+@@ -129,8 +129,8 @@ bus_test_launch_helper_SOURCES=		\
+ 	$(LAUNCH_HELPER_SOURCES)
+ 
+ bus_test_launch_helper_LDADD=		\
+-	$(DBUS_LAUNCHER_LIBS)			\
+-	$(top_builddir)/dbus/libdbus-convenience.la
++	$(top_builddir)/dbus/libdbus-convenience.la \
++	$(DBUS_LAUNCHER_LIBS)
+ 
+ bus_test_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ bus_test_launch_helper_CPPFLAGS=	\
+diff --git a/bus/Makefile.in b/bus/Makefile.in
+index fde3829..02520b6 100644
+--- a/bus/Makefile.in
++++ b/bus/Makefile.in
+@@ -111,8 +111,9 @@ am_bus_test_launch_helper_OBJECTS =  \
+ 	bus_test_launch_helper-test-launch-helper.$(OBJEXT) \
+ 	$(am__objects_5)
+ bus_test_launch_helper_OBJECTS = $(am_bus_test_launch_helper_OBJECTS)
+-bus_test_launch_helper_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/dbus/libdbus-convenience.la
++bus_test_launch_helper_DEPENDENCIES =  \
++	$(top_builddir)/dbus/libdbus-convenience.la \
++	$(am__DEPENDENCIES_1)
+ bus_test_launch_helper_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(bus_test_launch_helper_LDFLAGS) $(LDFLAGS) -o $@
+@@ -142,8 +143,9 @@ am__dbus_daemon_SOURCES_DIST = activation.c activation.h \
+ 	config-loader-libxml.c main.c
+ am_dbus_daemon_OBJECTS = $(am__objects_3) main.$(OBJEXT)
+ dbus_daemon_OBJECTS = $(am_dbus_daemon_OBJECTS)
+-dbus_daemon_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/dbus/libdbus-convenience.la
++dbus_daemon_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++	$(top_builddir)/dbus/libdbus-convenience.la \
++	$(am__DEPENDENCIES_1)
+ dbus_daemon_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(dbus_daemon_LDFLAGS) $(LDFLAGS) -o $@
+@@ -160,8 +162,9 @@ am_dbus_daemon_launch_helper_OBJECTS =  \
+ 	activation-helper-bin.$(OBJEXT) $(am__objects_6)
+ dbus_daemon_launch_helper_OBJECTS =  \
+ 	$(am_dbus_daemon_launch_helper_OBJECTS)
+-dbus_daemon_launch_helper_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/dbus/libdbus-convenience.la
++dbus_daemon_launch_helper_DEPENDENCIES =  \
++	$(top_builddir)/dbus/libdbus-convenience.la \
++	$(am__DEPENDENCIES_1)
+ dbus_daemon_launch_helper_LINK = $(LIBTOOL) --tag=CC \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ 	$(AM_CFLAGS) $(CFLAGS) $(dbus_daemon_launch_helper_LDFLAGS) \
+@@ -185,8 +188,9 @@ am_dbus_daemon_launch_helper_test_OBJECTS = dbus_daemon_launch_helper_test-activ
+ 	$(am__objects_8)
+ dbus_daemon_launch_helper_test_OBJECTS =  \
+ 	$(am_dbus_daemon_launch_helper_test_OBJECTS)
+-dbus_daemon_launch_helper_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/dbus/libdbus-convenience.la
++dbus_daemon_launch_helper_test_DEPENDENCIES =  \
++	$(top_builddir)/dbus/libdbus-convenience.la \
++	$(am__DEPENDENCIES_1)
+ dbus_daemon_launch_helper_test_LINK = $(LIBTOOL) --tag=CC \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ 	$(AM_CFLAGS) $(CFLAGS) \
+@@ -497,8 +501,8 @@ dbus_daemon_SOURCES = \
+ 
+ dbus_daemon_LDADD = \
+ 	$(EFENCE)					\
+-	$(DBUS_BUS_LIBS)				\
+-	$(top_builddir)/dbus/libdbus-convenience.la
++	$(top_builddir)/dbus/libdbus-convenience.la	\
++	$(DBUS_BUS_LIBS)
+ 
+ dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
+ LAUNCH_HELPER_SOURCES = \
+@@ -520,8 +524,8 @@ dbus_daemon_launch_helper_SOURCES = \
+ 	$(LAUNCH_HELPER_SOURCES)
+ 
+ dbus_daemon_launch_helper_LDADD = \
+-	$(DBUS_LAUNCHER_LIBS)			\
+-	$(top_builddir)/dbus/libdbus-convenience.la
++	$(top_builddir)/dbus/libdbus-convenience.la \
++	$(DBUS_LAUNCHER_LIBS)
+ 
+ dbus_daemon_launch_helper_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ dbus_daemon_launch_helper_test_SOURCES = \
+@@ -529,8 +533,8 @@ dbus_daemon_launch_helper_test_SOURCES = \
+ 	$(LAUNCH_HELPER_SOURCES)
+ 
+ dbus_daemon_launch_helper_test_LDADD = \
+-	$(DBUS_LAUNCHER_LIBS)			\
+-	$(top_builddir)/dbus/libdbus-convenience.la
++	$(top_builddir)/dbus/libdbus-convenience.la \
++	$(DBUS_LAUNCHER_LIBS)
+ 
+ dbus_daemon_launch_helper_test_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ dbus_daemon_launch_helper_test_CPPFLAGS = \
+@@ -541,8 +545,8 @@ bus_test_launch_helper_SOURCES = \
+ 	$(LAUNCH_HELPER_SOURCES)
+ 
+ bus_test_launch_helper_LDADD = \
+-	$(DBUS_LAUNCHER_LIBS)			\
+-	$(top_builddir)/dbus/libdbus-convenience.la
++	$(top_builddir)/dbus/libdbus-convenience.la \
++	$(DBUS_LAUNCHER_LIBS)
+ 
+ bus_test_launch_helper_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ bus_test_launch_helper_CPPFLAGS = \

Modified: packages/unstable/dbus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/patches/series?rev=3167&op=diff
==============================================================================
--- packages/unstable/dbus/debian/patches/series (original)
+++ packages/unstable/dbus/debian/patches/series Thu Jul 16 00:02:32 2009
@@ -3,3 +3,4 @@
 02_dbus_monitor_no_sigint_handler.patch
 10_dbus-1.0.1-generate-xml-docs.patch
 20_kbsd_cmsgcred.patch
+30_rt-as-needed.patch

More information about the Pkg-utopia-commits mailing list