El Sábado, 27 de Agosto de 2005 23:18, David Nusinow escribió:
> The build error looks like one that I encountered in working on 6.9 that I
> wasn't able to resolve. There's a file that's created on the fly by the
> makefile which is not created when we only build the server for
> xserver-xorg-dbg. This causes the build to fail because the file isn't
> present. I opted, on Michael's recommendation, to go for a totally
> different method of building the -dbg package instead of actually solving
> the problem, but that's really not an option for 6.8 right now.
Mmmm...let me see...I test my patches by building the whole server, both
normal and debug-enabled. I remember some issues with the static server, let
me dig into my patches.
[some time later]
The thing I needed was to "#ifdef XFree86LOADER" some code. Apart from that,
I did not had any problem. The patch that I needed to apply (and it was
applied to my committed patch) was:
diff -urN --exclude=CVS
--exclude=.svn ../../../cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c
xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c
--- ../../../cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c
2005-07-11 04:29:59.000000000 +0200
+++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c
2005-08-20 11:37:03.607764570 +0200
@@ -1281,7 +1281,9 @@
psav->EntityIndex = pEnt->index;
if (xf86LoadSubModule(pScrn, "vbe")) {
+#ifdef XFree86LOADER
xf86LoaderReqSymLists(vbeSymbols, NULL);
+#endif /* XFree86LOADER */
psav->pVbe = VBEInit(NULL, pEnt->index);
}
@@ -4336,7 +4338,9 @@
vbeInfoPtr pVbe;
if (xf86LoadSubModule(pScrn, "vbe")) {
+#ifdef XFree86LOADER
xf86LoaderReqSymLists(vbeSymbols, NULL);
+#endif /* XFree86LOADER */
pVbe = VBEInit(NULL, index);
ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
vbeFree(pVbe);
This code is present in my patch. Weird.
I am running a full build now in order to catch the error.
> I'm currently building -6 packages right now without this change. I know
> you put in a fair amount of work in to this, so I don't want to just kick
> the change out, but I need to keep Xorg moving in to testing, so the fix
> for #321641 really needs to go in soon. I won't upload my current packages
Thank you very much for your consideration. :-)
> right away, so as to give you a chance to figure this one out, but it's
> probably more worthwhile to put our efforts in to pushing through the last
> parts of the 6.9 packaging instead of fighting with backported drivers. Let
> me know what you think.
I agree. I only need to know how to work on 6.9. O:-) My SVN abilities are
poor...time to ehnance them a bit.
Best regards,
Ender.
--
- Kyle, all those times I said you were a dumb, stupid Jew,
well, I was wrong, you're not a Jew.
- Cartman, I *am* Jewish!
- There, there, don't be hard on yourself, Kyle.
-- Cartman & Kyle (South Park).
--
Debian developer
Attachment:
pgpBMONB119yk.pgp
Description: PGP signature