Bug#472205: xorg-server: FTBFS on alpha in hw/xfree86/os-support/bus/axpPci.c
On Sat, Mar 22, 2008 at 18:28:44 +0100, Julien Cristau wrote:
> http://experimental.debian.net/fetch.php?&pkg=xorg-server&ver=2%3A1.4.99.901-1&arch=alpha&stamp=1206153477&file=log&as=raw
>
> This needs porting to pciaccess, much of the arch-specific pci handling
> code should probably be removed... This has been done upstream for ia64
> recently, but not for alpha.
> Help from alpha porters would be much appreciated :)
>
The attached patch might be a starting point. It at least gets the
server built, but I have no idea if it works right (and no way to test).
Cheers,
Julien
diff -Nru xorg-server-1.4.99.901/configure.ac xorg-server-1.4.99.901/configure.ac
--- xorg-server-1.4.99.901/configure.ac 2008-03-23 17:26:58.000000000 +0000
+++ xorg-server-1.4.99.901/configure.ac 2008-03-23 17:27:00.000000000 +0000
@@ -1327,8 +1327,6 @@
;;
alpha*)
linux_alpha=yes
- XORG_OS_PCI="axp"
- xorg_bus_linuxpci="no"
;;
i*86|amd64*|x86_64*)
linux_acpi="yes"
diff -Nru xorg-server-1.4.99.901/hw/xfree86/os-support/bus/Makefile.am xorg-server-1.4.99.901/hw/xfree86/os-support/bus/Makefile.am
--- xorg-server-1.4.99.901/hw/xfree86/os-support/bus/Makefile.am 2008-03-23 17:26:58.000000000 +0000
+++ xorg-server-1.4.99.901/hw/xfree86/os-support/bus/Makefile.am 2008-03-23 17:27:00.000000000 +0000
@@ -23,9 +23,9 @@
PCI_SOURCES += sparcPci.c
endif
-if LINUX_ALPHA
-PCI_SOURCES += axpPci.c
-endif
+#if LINUX_ALPHA
+#PCI_SOURCES += axpPci.c
+#endif
if XORG_BUS_SPARC
PLATFORM_SOURCES = Sbus.c
diff -Nru xorg-server-1.4.99.901/hw/xfree86/os-support/bus/Pci.h xorg-server-1.4.99.901/hw/xfree86/os-support/bus/Pci.h
--- xorg-server-1.4.99.901/hw/xfree86/os-support/bus/Pci.h 2008-03-23 17:26:58.000000000 +0000
+++ xorg-server-1.4.99.901/hw/xfree86/os-support/bus/Pci.h 2008-03-23 17:27:00.000000000 +0000
@@ -195,7 +195,7 @@
*/
#if defined(__alpha__)
# if defined(linux)
-# define ARCH_PCI_INIT axpPciInit
+# define ARCH_PCI_INIT linuxPciInit
# endif
#elif defined(__arm__)
# if defined(linux)
diff -Nru xorg-server-1.4.99.901/hw/xfree86/os-support/linux/Makefile.am xorg-server-1.4.99.901/hw/xfree86/os-support/linux/Makefile.am
--- xorg-server-1.4.99.901/hw/xfree86/os-support/linux/Makefile.am 2008-03-23 17:26:58.000000000 +0000
+++ xorg-server-1.4.99.901/hw/xfree86/os-support/linux/Makefile.am 2008-03-23 17:27:00.000000000 +0000
@@ -8,7 +8,6 @@
if LINUX_ALPHA
noinst_LTLIBRARIES += liblinuxev56.la
PLATFORM_PCI_SUPPORT = \
- $(srcdir)/lnx_axp.c \
$(srcdir)/../shared/xf86Axp.c
liblinuxev56_la_CFLAGS = $(AM_CFLAGS) -mcpu=ev56
Reply to: