Attachment 3128 Details for Bug 4313 – dbus-0.36.1 Cygwin build fixes

[patch] dbus-0.36.1 Cygwin build fixes

dbus-0.36.1-1.patch (text/plain), 7.18 KB, created by Yaakov Selkowitz on 2005-08-30 16:45:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2005-08-30 16:45:45 UTC

Size: 7.18 KB

patch

obsolete

>diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x reference dbus-0.36.1-orig/configure.in dbus-0.36.1/configure.in
>--- dbus-0.36.1-orig/configure.in	2005-08-24 10:11:34.000000000 -0500
>+++ dbus-0.36.1/configure.in	2005-08-30 17:25:43.236892200 -0500
>@@ -940,6 +940,7 @@
>         if test -f "$dir/qglobal.h"; then
>             have_qt=yes
>             DBUS_QT_CXXFLAGS="-I$dir"
>+            DBUS_QT_LIBS="-L$QTDIR/lib -lqt-mt"
>        fi
>     done
> fi
>@@ -949,18 +950,6 @@
>    AC_MSG_RESULT([not found])
> fi
> 
>-dnl linking to kdecore will give us a bit of help from libtool
>-if (! kde-config >& /dev/null); then
>-    have_qt=no
>-else
>-    kdelibs=`kde-config --install lib --expandvars 2>/dev/null`
>-    if test -z $kdelibs -o ! -f $kdelibs/libkdecore.la; then
>-        have_qt=no
>-    else
>-        DBUS_QT_LIBS="$kdelibs/libkdecore.la"
>-    fi
>-fi
>-
> if test x$have_qt = xno ; then
>     AC_MSG_WARN([Qt development libraries not found])
> fi
>diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x reference dbus-0.36.1-orig/dbus/Makefile.am dbus-0.36.1/dbus/Makefile.am
>--- dbus-0.36.1-orig/dbus/Makefile.am	2005-07-14 15:44:15.000000000 -0500
>+++ dbus-0.36.1/dbus/Makefile.am	2005-08-25 14:40:52.234375000 -0500
>@@ -167,7 +167,7 @@
> libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS)
> ## don't export symbols that start with "_" (we use this 
> ## convention for internal symbols)
>-libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
>+libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined
> 
> ## 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 
>diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x reference dbus-0.36.1-orig/gcj/org/freedesktop/dbus/Makefile.am dbus-0.36.1/gcj/org/freedesktop/dbus/Makefile.am
>--- dbus-0.36.1-orig/gcj/org/freedesktop/dbus/Makefile.am	2003-06-23 12:39:48.000000000 -0500
>+++ dbus-0.36.1/gcj/org/freedesktop/dbus/Makefile.am	2005-08-30 16:44:16.611892200 -0500
>@@ -32,7 +32,7 @@
> 	$(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) $(CXXFLAGS) $(CPPFLAGS) -c -o '$@' '$<'
> 
> .java.lo:
>-	$(LIBTOOL) --mode=compile $(GCJ) $(GCJ_FLAGS) -c -o '$@' '$<'
>+	$(LIBTOOL) --mode=compile $(GCJ) $(INCLUDES) $(GCJ_FLAGS) -c -o '$@' '$<'
> 
> libdbus_gcj_1_la_SOURCES =
> 
>@@ -43,6 +43,8 @@
> 	$(java_class_files)
> 
> 
>+libdbus_gcj_1_la_LDFLAGS = -no-undefined
>+
> libdbus_gcj_1_la_LIBADD = 		\
> 	$(native_object_files)		\
> 	$(java_object_files)
>@@ -51,5 +53,5 @@
> 	$(native_sources)		\
> 	$(java_sources)
> 
>-libdbus_gcj_1_la_LINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
>+libdbus_gcj_1_la_LINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
> 
>diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x reference dbus-0.36.1-orig/glib/Makefile.am dbus-0.36.1/glib/Makefile.am
>--- dbus-0.36.1-orig/glib/Makefile.am	2005-08-04 10:49:30.000000000 -0500
>+++ dbus-0.36.1/glib/Makefile.am	2005-08-25 15:29:03.171875000 -0500
>@@ -42,10 +42,10 @@
> 
> libdbus_glibdir = $(includedir)/dbus-1.0/dbus
> 
>-libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(top_builddir)/dbus/libdbus-1.la
>+libdbus_glib_1_la_LIBADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_GLIB_LIBS)
> ## don't export symbols that start with "_" (we use this 
> ## convention for internal symbols)
>-libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
>+libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined
> 
> # convenience lib used here and by dbus-viewer
> noinst_LTLIBRARIES=libdbus-gtool.la
>@@ -67,7 +67,7 @@
> 	dbus-glib-tool.h			\
> 	dbus-glib-tool.c
> 
>-dbus_binding_tool_LDADD= -lexpat libdbus-gtool.la
>+dbus_binding_tool_LDADD= libdbus-gtool.la $(DBUS_GLIB_LIBS) -lexpat
> 
> ## we just rebuilt these manually and check them into cvs; easier than
> ## convincing automake/make to do this properly
>diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x reference dbus-0.36.1-orig/qt/Makefile.am dbus-0.36.1/qt/Makefile.am
>--- dbus-0.36.1-orig/qt/Makefile.am	2005-03-07 15:10:46.000000000 -0600
>+++ dbus-0.36.1/qt/Makefile.am	2005-08-25 14:43:19.578125000 -0500
>@@ -30,7 +30,7 @@
> CLEANFILES=connection.moc integrator.moc server.moc
> 
> libdbus_qt_1_la_LIBADD= $(DBUS_QT_LIBS) $(top_builddir)/dbus/libdbus-1.la
>-libdbus_qt_1_la_LDFLAGS= -version-info 1:0
>+libdbus_qt_1_la_LDFLAGS= -version-info 1:0 -no-undefined
> 
> %.moc: %.h
> 	$(QT_MOC) $< > $@
>diff -urN -x .build -x .inst -x .sinst -x configure -x Makefile.in -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x 'intltool*' -x autom4te.cache -x reference dbus-0.36.1-orig/tools/Makefile.am dbus-0.36.1/tools/Makefile.am
>--- dbus-0.36.1-orig/tools/Makefile.am	2005-07-08 11:25:28.000000000 -0500
>+++ dbus-0.36.1/tools/Makefile.am	2005-08-25 17:22:45.968750000 -0500
>@@ -6,7 +6,7 @@
> nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
> libdbus_glibdir = $(includedir)/dbus-1.0/dbus
> 
>-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/glib/dbus-binding-tool
>+dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/glib/dbus-binding-tool$(EXEEXT)
> 	$(top_builddir)/glib/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml
> 
> BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
>@@ -22,7 +22,7 @@
> endif
> 
> if HAVE_GLIB
>-dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon dbus-launch dbus-send $(top_builddir)/bus/dbus-daemon Makefile
>+dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon$(EXEEXT) dbus-launch$(EXEEXT) dbus-send$(EXEEXT) $(top_builddir)/bus/dbus-daemon$(EXEEXT) Makefile
> 	DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh ./dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
> endif
> 
>@@ -54,7 +54,7 @@
> dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la
> dbus_monitor_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
> dbus_launch_LDADD= $(DBUS_X_LIBS)
>-dbus_viewer_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_THREADS_LIBS)
>+dbus_viewer_LDADD= $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_THREADS_LIBS) $(DBUS_GLIB_TOOL_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

Actions: View | Splinter Review

Attachments on bug 4313: 3128

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.