- fix building with systemtap/dtrace enabled

diff --git a/dtrace-link.patch b/dtrace-link.patch
new file mode 100644 (file)
index 0000000..a65f91c
--- /dev/null
+++ b/dtrace-link.patch
@@ -0,0 +1,17 @@
+--- xorg-server-1.16.3/os/Makefile.am~ 2015-01-04 14:05:54.000000000 +0000
++++ xorg-server-1.16.3/os/Makefile.am  2015-01-04 14:23:50.646159253 +0000
+@@ -52,12 +52,12 @@
+ 
+ if SPECIAL_DTRACE_OBJECTS
+ # Generate dtrace object code for probes in libos & libdix
+-dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)
++dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS) $(LIBOBJS)
+       $(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o
+ 
+ noinst_PROGRAMS = os.O
+ 
+ os_O_SOURCES =
+-os.O: dtrace.o $(am_libos_la_OBJECTS)
++os.O: dtrace.o $(am_libos_la_OBJECTS) $(LIBOBJS)
+       $(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o
+ endif

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index e7102508efe0ce21769d616777ba2980b1cc3b42..6841a242820eb8aa57c973820cddf0be748aa945 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -48,6 +48,7 @@ Source12:     xvfb-run.sh
 
 Patch0:                %{name}-xwrapper.patch
 Patch1:                %{name}-pic-libxf86config.patch
+Patch2:                dtrace-link.patch
 
 Patch4:                %{name}-builtin-SHA1.patch
 Patch5:                %{name}-export-GetMaster.patch
@@ -428,6 +429,7 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %setup -q -n xorg-server-%{version}
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 %patch4 -p1
 %patch5 -p1