Bug 962

Summary: Build fixes for DoLoadableServer = NO
Product: xorg Reporter: Matthieu Herrb <matthieu.herrb>
Component: Server/DDX/Xorg/dlloaderAssignee: Adam Jackson <ajax>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: high CC: ajax, kem, sndirsch
Version: git   
Hardware: Other   
OS: OpenBSD   
Whiteboard:
i915 platform: i915 features:
Bug Depends on:    
Bug Blocks: 351, 400    
Attachments:
Description Flags
proposed patch
none
version 2
none
supplements to version 2 none

Description Matthieu Herrb 2004-08-01 07:16:09 UTC
the recent dl loader fixes break builds with DoLoadableServer set to NO. 
Attached patch is an attempt to fix. 
Maybe LoaderSymbol should be turned into a macro instead ?
Comment 1 Matthieu Herrb 2004-08-01 07:17:07 UTC
Created attachment 552 [details] [review]
proposed patch
Comment 2 Adam Jackson 2004-08-01 11:33:18 UTC
better yet, i'll just remove all the remaining calls to LoaderSymbol in the
drivers.  i knew it was a hack to begin with.  still a valid point though, we
ought to no-op the loader API when doing a loader-free build.

assigning to me.
Comment 3 Kevin E. Martin 2004-08-02 06:35:28 UTC
I would like to check in Mattheiu's patch until you have time to finish the dll
loader work, so that work can proceed on other bugs.
Comment 4 Adam Jackson 2004-08-02 08:00:40 UTC
Created attachment 555 [details] [review]
version 2

i'd rather do something like this.  applies against CVS HEAD without Mattheiu's
patch.
Comment 5 Matthieu Herrb 2004-08-02 14:04:15 UTC
Created attachment 559 [details] [review]
supplements to version 2

Your patch works here (OpenBSD/amd64), except for 2 missing parts from my
original patch, and one typo.
Comment 6 Kevin E. Martin 2004-08-02 15:55:31 UTC
Verified that with your version 2 patch and Matthieu's supplemental patch, the
build completes.  Could you go ahead and check in these patches?
Comment 7 Adam Jackson 2004-08-02 19:47:48 UTC
checked in, closing.  thanks for the review.
Comment 8 Stefan Dirsch 2004-08-03 00:52:35 UTC
I get now a warning with the patches checked in, which our (SuSE) build system 
(i386) treats as fatal ("Program is likely not 64bit clean. Please investigate 
and fix") and fails. 
 
mga_storm32.c: In function `Mga32AccelInit': 
mga_storm32.c:748: warning: implicit declaration of function 
`XAACachePlanarMonoStippleWeak' 
mga_storm32.c:748: warning: assignment makes pointer from integer without a 
cast 
 
Could you please have a look at this? The changes of the other drivers don't 
suffer from a similar problem. 
Comment 9 Stefan Dirsch 2004-08-03 00:57:11 UTC
Looks like there was a typo in mga_storm.c in Matthieu's supplemental patch 
("Weak" added). 
 
-	infoPtr->CacheMonoStipple = LoaderSymbol("XAACachePlanarMonoStipple"); 
+	infoPtr->CacheMonoStipple = XAACachePlanarMonoStippleWeak(); 
Comment 10 Matthieu Herrb 2004-08-03 01:56:31 UTC
Well there's a problem with declaration of pointers to functions in the patch.
I'm fixing these now. 

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.