| 1 |
ssuominen 09/08/05 17:20:58 |
| 2 |
|
| 3 |
Added: dbus-1.3.0-asneeded.patch |
| 4 |
Log: |
| 5 |
Fix test suite building with -Wl,--as-needed (undefined reference to clock_gettime) wrt #280170. |
| 6 |
(Portage version: 2.2_rc36/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-apps/dbus/files/dbus-1.3.0-asneeded.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/dbus/files/dbus-1.3.0-asneeded.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/dbus/files/dbus-1.3.0-asneeded.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: dbus-1.3.0-asneeded.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur dbus-1.3.0.orig/dbus/Makefile.am dbus-1.3.0/dbus/Makefile.am |
| 17 |
--- dbus-1.3.0.orig/dbus/Makefile.am 2008-04-04 19:32:04.000000000 +0300 |
| 18 |
+++ dbus-1.3.0/dbus/Makefile.am 2009-08-05 20:15:21.000000000 +0300 |
| 19 |
@@ -176,6 +176,7 @@ |
| 20 |
libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined @R_DYNAMIC_LDFLAG@ @PIC_LDFLAGS@ |
| 21 |
|
| 22 |
libdbus_convenience_la_LDFLAGS=@R_DYNAMIC_LDFLAG@ |
| 23 |
+libdbus_convenience_la_LIBADD=$(DBUS_TEST_LIBS) |
| 24 |
|
| 25 |
## note that TESTS has special meaning (stuff to use in make check) |
| 26 |
## so if adding tests not to be run in make check, don't add them to |
| 27 |
@@ -194,7 +195,7 @@ |
| 28 |
dbus_test_SOURCES= \ |
| 29 |
dbus-test-main.c |
| 30 |
|
| 31 |
-dbus_test_LDADD=libdbus-convenience.la $(DBUS_TEST_LIBS) |
| 32 |
+dbus_test_LDADD=$(DBUS_TEST_LIBS) libdbus-convenience.la |
| 33 |
dbus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ |
| 34 |
|
| 35 |
## mop up the gcov files |
| 36 |
diff -ur dbus-1.3.0.orig/test/name-test/Makefile.am dbus-1.3.0/test/name-test/Makefile.am |
| 37 |
--- dbus-1.3.0.orig/test/name-test/Makefile.am 2009-07-16 17:01:01.000000000 +0300 |
| 38 |
+++ dbus-1.3.0/test/name-test/Makefile.am 2009-08-05 20:12:15.000000000 +0300 |
| 39 |
@@ -21,52 +21,52 @@ |
| 40 |
test_names_SOURCES= \ |
| 41 |
test-names.c |
| 42 |
|
| 43 |
-test_names_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS) |
| 44 |
+test_names_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la |
| 45 |
test_names_LDFLAGS=@R_DYNAMIC_LDFLAG@ |
| 46 |
|
| 47 |
test_pending_call_dispatch_SOURCES = \ |
| 48 |
test-pending-call-dispatch.c |
| 49 |
|
| 50 |
-test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS) |
| 51 |
+test_pending_call_dispatch_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la |
| 52 |
test_pending_call_dispatch_LDFLAGS=@R_DYNAMIC_LDFLAG@ |
| 53 |
|
| 54 |
test_pending_call_timeout_SOURCES = \ |
| 55 |
test-pending-call-timeout.c |
| 56 |
|
| 57 |
-test_pending_call_timeout_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS) |
| 58 |
+test_pending_call_timeout_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la |
| 59 |
test_pending_call_timeout_LDFLAGS=@R_DYNAMIC_LDFLAG@ |
| 60 |
|
| 61 |
test_threads_init_SOURCES = \ |
| 62 |
test-threads-init.c |
| 63 |
|
| 64 |
-test_threads_init_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS) |
| 65 |
+test_threads_init_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la |
| 66 |
test_threads_init_LDFLAGS=@R_DYNAMIC_LDFLAG@ |
| 67 |
|
| 68 |
test_ids_SOURCES = \ |
| 69 |
test-ids.c |
| 70 |
|
| 71 |
-test_ids_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS) |
| 72 |
+test_ids_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la |
| 73 |
test_ids_LDFLAGS=@R_DYNAMIC_LDFLAG@ |
| 74 |
|
| 75 |
test_shutdown_SOURCES = \ |
| 76 |
test-shutdown.c |
| 77 |
|
| 78 |
test_shutdown_CFLAGS= |
| 79 |
-test_shutdown_LDADD=$(top_builddir)/dbus/libdbus-convenience.la ../libdbus-testutils.la $(DBUS_TEST_LIBS) |
| 80 |
+test_shutdown_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la ../libdbus-testutils.la |
| 81 |
test_shutdown_LDFLAGS=@R_DYNAMIC_LDFLAG@ |
| 82 |
|
| 83 |
test_privserver_SOURCES = \ |
| 84 |
test-privserver.c |
| 85 |
|
| 86 |
test_privserver_CFLAGS= |
| 87 |
-test_privserver_LDADD=$(top_builddir)/dbus/libdbus-convenience.la ../libdbus-testutils.la $(DBUS_TEST_LIBS) |
| 88 |
+test_privserver_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la ../libdbus-testutils.la |
| 89 |
test_privserver_LDFLAGS=@R_DYNAMIC_LDFLAG@ |
| 90 |
|
| 91 |
test_privserver_client_SOURCES = \ |
| 92 |
test-privserver-client.c |
| 93 |
|
| 94 |
test_privserver_client_CFLAGS= |
| 95 |
-test_privserver_client_LDADD=$(top_builddir)/dbus/libdbus-convenience.la ../libdbus-testutils.la $(DBUS_TEST_LIBS) |
| 96 |
+test_privserver_client_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la ../libdbus-testutils.la |
| 97 |
test_privserver_client_LDFLAGS=@R_DYNAMIC_LDFLAG@ |
| 98 |
|
| 99 |
endif |
Archives