Good News everybody!
I have been trying to build the phase1v5 packages on m68k. Seems I have
found a fix for the lnxResource.c problem I had at first, see first
attachment for the patch I used.
However, only shortly thereafter, I hit another problem:
[...]
making all in programs/Xserver/hw/xfree86/os-support/vbe/module...
make[9]: Entering directory
`/build/source/xfree4.0/xfree86-1-4.0.1/build-tree/xc/programs/Xserver/hw/xfree86/os-support/vbe/module'
rm -f vbe.o
gcc -c -O2 -ansi -pedantic -Wall -Wpointer-arith -Wstrict-prototypes
-Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -I.
-I../../../../../../../programs/Xserver/hw/xfree86/common
-I../../../../../../../programs/Xserver/hw/xfree86/os-support
-I../../../../../../../programs/Xserver/include
-I../../../../../../../exports/include/X11
-I../../../../../../../programs/Xserver/hw/xfree86/int10
-I../../../../../../../programs/Xserver/hw/xfree86/ddc
-I../../../../../../../programs/Xserver/hw/xfree86/i2c -I../../../../../../..
-I../../../../../../../exports/include -Dlinux -D__mc68000__
-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE
-I/usr/src/linux/include -D_GNU_SOURCE -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP
-DXCSECURITY -DTOGCUP -DXF86BIGFONT -DDPMSExtension -DPIXPRIV -DPANORAMIX
-DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH -DXFreeXDGA -DXvExtension
-DXFree86LOADER -DXFree86Server -DXF86VIDMODE -DSMART_SCHEDULE
-DX_BYTE_ORDER=X_BIG_ENDIAN -DNDEBUG -DFUNCPROTO=15 -DNARROWPROTO -DIN_MODULE
vbe.c
rm -f vbe_module.o
gcc -c -O2 -ansi -pedantic -Wall -Wpointer-arith -Wstrict-prototypes
-Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -I.
-I../../../../../../../programs/Xserver/hw/xfree86/common
-I../../../../../../../programs/Xserver/hw/xfree86/os-support
-I../../../../../../../programs/Xserver/include
-I../../../../../../../exports/include/X11
-I../../../../../../../programs/Xserver/hw/xfree86/int10
-I../../../../../../../programs/Xserver/hw/xfree86/ddc
-I../../../../../../../programs/Xserver/hw/xfree86/i2c -I../../../../../../..
-I../../../../../../../exports/include -Dlinux -D__mc68000__
-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE
-I/usr/src/linux/include -D_GNU_SOURCE -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP
-DXCSECURITY -DTOGCUP -DXF86BIGFONT -DDPMSExtension -DPIXPRIV -DPANORAMIX
-DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH -DXFreeXDGA -DXvExtension
-DXFree86LOADER -DXFree86Server -DXF86VIDMODE -DSMART_SCHEDULE
-DX_BYTE_ORDER=X_BIG_ENDIAN -DNDEBUG -DFUNCPROTO=15 -DNARROWPROTO -DIN_MODULE
vbe_module.c
rm -f DONE
touch DONE
rm -f libvbe.a
ar clq libvbe.a vbe.o vbe_module.o
ranlib libvbe.a
rm -f ../../../../../../../exports/lib/modules/./libvbe.a
+ cd ../../../../../../../exports/lib/modules/.
+ ln -s ../../../programs/Xserver/hw/xfree86/os-support/vbe/module/libvbe.a .
make[9]: Leaving directory
`/build/source/xfree4.0/xfree86-1-4.0.1/build-tree/xc/programs/Xserver/hw/xfree86/os-support/vbe/module'
make[8]: Leaving directory
`/build/source/xfree4.0/xfree86-1-4.0.1/build-tree/xc/programs/Xserver/hw/xfree86/os-support/vbe'
rm -f libxf86_os.a
ar clq libxf86_os.a linux/?*.o /?*.o misc/?*.o vbe/?*.o
ar: /?*.o: No such file or directory
make[7]: *** [libxf86_os.a] Error 1
make[7]: Leaving directory
`/build/source/xfree4.0/xfree86-1-4.0.1/build-tree/xc/programs/Xserver/hw/xfree86/os-support'
make[6]: *** [all] Error 2
[...]
I'm not an expert, but I think there is an error in the Imakefile. At the
top BUS_SUBDIR is defined for several architectures, not for m68k.
Later, BUS_SUBDIR is added to SUBDIRS and SRCS, no problem if its empty.
However, when it is added to OBJS and it is empty, there is a difference,
which would explain the "No such file or directory" error above.
OBJS should be capsuled with some #ifdef HasBusSubdir or something but I
have no nice solution right now, Branden? I'll append a diff with a quick
hack for m68k only as second attachment. Call me in a day, if you want to
know if it worked out...
Christian
--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c.orig Wed Jun 14
21:41:25 2000
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c Fri Jul 28
+19:33:59 2000
@@ -150,7 +150,7 @@
return ret;
}
-#elif defined(__powerpc__) || defined(__sparc__) || defined(__mips__)
+#elif defined(__powerpc__) || defined(__sparc__) || defined(__mips__) ||
+defined(__mc68000__)
/* XXX this isn't exactly correct but it will get the server working
* for now until we get something better.
--- xc/programs/Xserver/hw/xfree86/os-support/Imakefile.orig Sat Jul 1 01:39:11
2000
+++ xc/programs/Xserver/hw/xfree86/os-support/Imakefile Thu Aug 3 21:00:53 2000
@@ -107,7 +107,8 @@
SUBDIRS = $(OS_SUBDIR) $(BUS_SUBDIR) misc vbe
SRCS = $(OS_SUBDIR)/?*.c $(BUS_SUBDIR)/?*.c misc/?*.c vbe/?*.c $(DRM_SRC)
-OBJS = $(OS_SUBDIR)/?*.o $(BUS_SUBDIR)/?*.o misc/?*.o vbe/?*.o $(DRM_OBJ)
+# hack for m68k
+OBJS = $(OS_SUBDIR)/?*.o misc/?*.o vbe/?*.o $(DRM_OBJ)
DONES = $(OS_SUBDIR)/DONE $(BUS_SUBDIR)/DONE misc/DONE vbe/DONE $(DRM_DONES)
