[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

patch for arm link failure & MANIFEST problem


The problem with the link failure for arm is as follow:

in the chips driver there seems to be code which is for arm32 and
for NetBSD. somehow the person who wrote this just added a define
fro arm32, but not to check for __NetBSD__. furthermore the
actual include which provides function (sysarch) that was missing
was commented out. maybe someone tried something and commented it
out, or whatever, who knows?
the reason why I assume it's __NetBSD__-ish is, that in other
places this <machine/sysarch.h> include was within a __NetBSD__
define, so it's most likely that the same applies here.

anyway, with the great help of Michel Daenzer I created a patch
and it seems to fix it so far, it linked without any errors. what
it does is simply to add a defined(__NetBSD__) to the #if which includes
the include statement for sysarch.h and otherwise just an empty

patch attached. you can change the name/number of the patch to
your likeing, i am not really creative when it comes to give it
sound names ;).

furthermore, the arm .debs for X 4.2.1 are in
~othmar/public_html/xfree86_4.2.1-0pre1v2 on gluck if
you want to use them for your X task force. or will be there


ok, as it turns out another problem arose, the MANIFEST changed,
nv was added and libafb.a was removed. i read the README but
well, won't actually apply to me probably, because it probably
just that a new driver was added and libafb.a was removed
(whatever that is). so i assume the debhelper ocmmands aren't affected
by that, no? 

i have attached the diff of the MANIFEST.arm which just showed up
while buidling the debian packages. hope it's ok.

btw. is it ok that there were quite many debconf-mergetemplate
messages, dropping things? or whole templates dropped, etc?

so long
--- xc/programs/Xserver/hw/xfree86/drivers/chips/ct_bank.c.orig	2002-10-03 19:06:39.000000000 +0000
+++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_bank.c	2002-10-03 19:06:51.000000000 +0000
@@ -53,12 +53,15 @@
 /* Driver specific headers */
 #include "ct_driver.h"
-#ifdef	__arm32__
-/*#include <machine/sysarch.h>*/
+#if defined(__arm32__) && defined(__NetBSD__)
+#include <machine/sysarch.h>
 #define	arm32_drain_writebuf()	sysarch(1, 0)
-#define ChipsBank(pScreen) CHIPSPTR(xf86Screens[pScreen->myNum])->Bank
+#elif defined(__arm32__)
+#define arm32_drain_writebuf() 
+#define ChipsBank(pScreen) CHIPSPTR(xf86Screens[pScreen->myNum])->Bank
 CHIPSSetRead(ScreenPtr pScreen, int bank)
--- debian/MANIFEST.arm 2002-09-27 09:38:11.000000000 +0000
+++ debian/MANIFEST.arm.new     2002-10-04 07:32:35.000000000 +0000
@@ -5641,0 +5642 @@
@@ -5677 +5677,0 @@
@@ -7370,0 +7371 @@

Reply to: