x11-servers/xorg-server: fix build on alpha

Christian Weisgerber naddy at freebsd.org
Mon Jun 11 23:45:18 UTC 2007


>Submitter-Id:	current-users
>Originator:	Christian Weisgerber
>Organization:	
>Confidential:	no 
>Synopsis:	x11-servers/xorg-server: fix build on alpha
>Severity:	serious
>Priority:	low
>Category:	ports
>Class:		sw-bug
>Release:	FreeBSD 5.5-STABLE alpha
>Environment:
System: FreeBSD kemoauc.mips.inka.de 5.5-STABLE FreeBSD 5.5-STABLE #0: Sun May 20 16:40:02 CEST 2007 naddy at kemoauc.mips.inka.de:/usr/obj/usr/src/sys/GENERIC alpha

>Description:

x11-servers/xorg-server fails to build on FreeBSD/alpha.  Patch
attached.  libio needs to be linked in in a few places (this was
lost during the modular Xorg update), an include directory was
missing, and contradictory function definitions clash.  For what
it's worth, OpenBSD has made equivalent changes.

(The server still doesn't work for me--it drops my PC164 into SRM
and in such a confused state that power-cycling is required--but
at least it builds so people can perform the Xorg update as described
and use remote X11.)

>How-To-Repeat:

>Fix:

Index: files/patch-configure
===================================================================
RCS file: files/patch-configure
diff -N files/patch-configure
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-configure	11 Jun 2007 20:42:51 -0000
@@ -0,0 +1,22 @@
+
+$FreeBSD$
+
+--- configure.orig
++++ configure
+@@ -24281,6 +24281,7 @@
+   alpha*)
+ 	ALPHA_VIDEO=yes
+ 	case $host_os in
++		*freebsd*)	SYS_LIBS=-lio ;;
+ 		*netbsd*)
+ cat >>confdefs.h <<\_ACEOF
+ #define USE_ALPHA_PIO 1
+@@ -30386,7 +30387,7 @@
+ 
+ if test "x$XORG" = xyes -o "x$XGL" = xyes; then
+ 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
+-	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
++	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/hw/xfree86/os-support/shared -I$(top_srcdir)/os'
+ 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
+ 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
+ 	XORG_LIBS="$COMPOSITE_LIB $MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XPSTUBS_LIB $OS_LIB"
Index: files/patch-hw_xfree86_utils_xorgcfg_stubs.c
===================================================================
RCS file: files/patch-hw_xfree86_utils_xorgcfg_stubs.c
diff -N files/patch-hw_xfree86_utils_xorgcfg_stubs.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-hw_xfree86_utils_xorgcfg_stubs.c	11 Jun 2007 20:42:51 -0000
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- hw/xfree86/utils/xorgcfg/stubs.c.orig
++++ hw/xfree86/utils/xorgcfg/stubs.c
+@@ -40,7 +40,7 @@
+ static char dummy;
+ #endif
+ 
+-#if !defined(USE_MODULES)
++#if 0
+ /* these are defined in libdummy.a */
+ int
+ ErrorF(const char *fmt, ...)


More information about the freebsd-x11 mailing list