diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-08 14:52:30 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-08 14:52:30 +0800 |
| commit | fe0100e8e8532859e88b2c6bda6d2227d8b92e0e (patch) | |
| tree | aa4b7c17d9f68202061ddf266cbc470f0f0a6b0a /devel/dbus | |
| parent | 8c22afa683793a72d8f899cde0366d41d2035a4f (diff) | |
| download | marcuscom-ports-fe0100e8e8532859e88b2c6bda6d2227d8b92e0e.tar marcuscom-ports-fe0100e8e8532859e88b2c6bda6d2227d8b92e0e.tar.gz marcuscom-ports-fe0100e8e8532859e88b2c6bda6d2227d8b92e0e.tar.bz2 marcuscom-ports-fe0100e8e8532859e88b2c6bda6d2227d8b92e0e.tar.lz marcuscom-ports-fe0100e8e8532859e88b2c6bda6d2227d8b92e0e.tar.xz marcuscom-ports-fe0100e8e8532859e88b2c6bda6d2227d8b92e0e.tar.zst marcuscom-ports-fe0100e8e8532859e88b2c6bda6d2227d8b92e0e.zip | |
More pthread fixes for tools.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7655 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/dbus')
| -rw-r--r-- | devel/dbus/files/patch-configure | 13 | ||||
| -rw-r--r-- | devel/dbus/files/patch-tools_Makefile.in | 32 |
2 files changed, 34 insertions, 11 deletions
diff --git a/devel/dbus/files/patch-configure b/devel/dbus/files/patch-configure index 15e7a10d2..0f19547d7 100644 --- a/devel/dbus/files/patch-configure +++ b/devel/dbus/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Sun Oct 8 02:05:16 2006 -+++ configure Sun Oct 8 02:06:24 2006 +--- configure.orig Sun Oct 8 02:48:06 2006 ++++ configure Sun Oct 8 02:50:34 2006 @@ -463,7 +463,7 @@ ac_includes_default="\ # include <unistd.h> #endif" @@ -18,15 +18,6 @@ -@@ -26602,7 +26602,7 @@ cat >>confdefs.h <<\_ACEOF - #define DBUS_BUILD_X11 1 - _ACEOF - -- DBUS_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" -+ DBUS_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $PTHREAD_LIBS" - DBUS_X_CFLAGS="$X_CFLAGS" - else - DBUS_X_LIBS= @@ -27929,6 +27929,7 @@ s,@X_LIBS@,$X_LIBS,;t t s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t s,@DBUS_X_CFLAGS@,$DBUS_X_CFLAGS,;t t diff --git a/devel/dbus/files/patch-tools_Makefile.in b/devel/dbus/files/patch-tools_Makefile.in new file mode 100644 index 000000000..41a417ecf --- /dev/null +++ b/devel/dbus/files/patch-tools_Makefile.in @@ -0,0 +1,32 @@ +--- tools/Makefile.in.orig Sun Oct 8 02:49:22 2006 ++++ tools/Makefile.in Sun Oct 8 02:51:10 2006 +@@ -150,6 +150,7 @@ DBUS_XML_DOCS_ENABLED_FALSE = @DBUS_XML_ + DBUS_XML_DOCS_ENABLED_TRUE = @DBUS_XML_DOCS_ENABLED_TRUE@ + DBUS_X_CFLAGS = @DBUS_X_CFLAGS@ + DBUS_X_LIBS = @DBUS_X_LIBS@ ++PTHREAD_LIBS = @PTHREAD_LIBS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DOXYGEN = @DOXYGEN@ +@@ -264,7 +265,7 @@ target_alias = @target_alias@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ +-INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" ++INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/share/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" + dbus_send_SOURCES = \ + dbus-print-message.c \ + dbus-print-message.h \ +@@ -281,9 +282,9 @@ dbus_launch_SOURCES = \ + dbus_cleanup_sockets_SOURCES = \ + dbus-cleanup-sockets.c + +-dbus_send_LDADD = $(top_builddir)/dbus/libdbus-1.la +-dbus_monitor_LDADD = $(top_builddir)/dbus/libdbus-1.la +-dbus_launch_LDADD = $(DBUS_X_LIBS) ++dbus_send_LDADD = $(top_builddir)/dbus/libdbus-1.la $(PTHREAD_LIBS) ++dbus_monitor_LDADD = $(top_builddir)/dbus/libdbus-1.la $(PTHREAD_LIBS) ++dbus_launch_LDADD = $(DBUS_X_LIBS) $(PTHREAD_LIBS) + man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1 + EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh + CLEANFILES = \ |