Summary: | xorg-x11-6.7.99.2 fails to build GL sparc | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | SpanKY <vapier> |
Component: | Current packages | Assignee: | Gentoo X packagers <x11> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | ajax, sparc |
Priority: | High | ||
Version: | unspecified | ||
Hardware: | Sparc | ||
OS: | All | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Bug Depends on: | |||
Bug Blocks: | 60292 | ||
Attachments: |
Add an include to Imakefile to pick up GL/internal/glcore.h
Sufficient patch to work around this problem with the xorg-x11-6.7.99.902.ebuild |
Description
SpanKY
2004-08-14 02:53:23 UTC
Sorry I missed this and duplicated at 60292. Please note further discussion in the comments to 60292 itself. Created attachment 37741 [details, diff] Add an include to Imakefile to pick up GL/internal/glcore.h Imakefile in mesa/sparc is missing an -I$(MESASRCDIR)/include -- this patch adds it. To test, put the patch into x11-base/xorg-x11/files & do this to xorg-x11-6.7.99.2.ebuild: ============ --- xorg-x11-6.7.99.2.ebuild- 2004-08-19 16:19:45.478470152 +0000 +++ xorg-x11-6.7.99.2.ebuild 2004-08-19 16:16:50.253108456 +0000 @@ -70,7 +70,7 @@ nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0 MIT SGI-B BSD FTL | GPL-2" SLOT="0" -KEYWORDS="~x86 ppc64 ~amd64 ~ppc ~mips" +KEYWORDS="~x86 ppc64 ~amd64 ~ppc ~mips ~sparc" # Need portage-2.0.50_pre9 for `use !foo` DEPEND=">=sys-apps/baselayout-1.8.3 @@ -571,6 +571,8 @@ epatch ${PATCHDIR} # epatch ${FILESDIR}/xorgconfig.c.diff # epatch ${FILESDIR}/xorg-stack-protector.patch + einfo "Apply sparc GL missing includes patch -- Fix bug 60305" + cd ${S} ; epatch ${FILESDIR}/sparc-GL-${PV}.patch cd ${S} host_def_setup =============== Oh, yes, when you put the patch into .../files, call it sparc-GL-6.7.99.2.patch if you want to use the ebuild change exactly as I showed it. Sorry for leaving that little piece of information out. With 6.7.9.902, xc/lib/GL fails on sparc in GL/mesa/sparc because of: sparc.c:32:21: context.h: No such file or directory sparc.c:33:26: math/m_xform.h: No such file or directory sparc.c:34:27: tnl/t_context.h: No such file or directory One way to pick these up is to make sure you have in the includes: -I../main & so on. Evidently the directories have been rearranged further, but the Imakefile in mesa/sparc is not keeping up with the changes. Once the new layout & soft links have stabalized, it should be posible to get a final Imakefile. I can generate further changes to force this version to compile, but not right now. Created attachment 37909 [details, diff] Sufficient patch to work around this problem with the xorg-x11-6.7.99.902.ebuild As mentioned in Comment 4, the Mesa layout has changed from 99.2 --> 99.902; this patch allows a clean compile for libGL on sparc with 6.7.99.902. The corresponding ebuild is unchanged: the patch name is changed to correspond to the tag generated in the ebuild. With this patch, xorg-x11-6.7.99.902 does build libGL.so, libOSMesa.so, and ffb_dri.so cleanly. (The official change from Xorg once the final layout is in place will not look quite like this. For one thing, this patch does not remove references to '.../mesa/src/SPARC' even though there is no longer any such directory. For another, the Imakefile as patched is not consistent on whether to use the actual Mesa source for its directories or whether to use one of the symbolic link versions. Indeed, it can't be right now because some files -- like sparc.h -- are only in '...mesa/src/sparc'; but others -- like t_context.h -- are available from all over the place. You want to pick up t_context.h from the local symbolic link, but it lives physically next to sparc.h (not available locally). So inconsistency at this point is built in to the libGL source structure.) reported upstream as http://freedesktop.org/bugzilla/show_bug.cgi?id=1154 fixed in upstream too. Thanks. Upstream real bug is http://freedesktop.org/bugzilla/show_bug.cgi?id=1104 but apparently hasn't been tested on Linux, only Solaris. If it doesn't work on Linux, please comment on the upstream bug. http://freedesktop.org/cgi-bin/viewcvs.cgi/xorg/xc/lib/GL/mesa/sparc/Imakefile?r1=1.1&r2=1.2 obviously not solaris-specific. The upstream patch from xorg does fix this problem. For anyone building on sparc, note that the attached ...902 patch is equivalent, and one of these must be applied by hand until Gentoo incorporates the patch into its ebuild. This is fixed in xorg-x11-6.7.99.903. Sparc testers -- do not use the local patch anymore; it is already present, and the local patch will conflict with current source. I know of no reason not to close this, but others might. the point of these .99.xxx ebuilds is to get things fixed upstream, not really in Gentoo .. since the upstream patch is correctly applied to xfree-xorg-6.7.99.903, then we should be all set This is fixed in all current X versions. Marking fixed. |