in-tree X.Org

in-tree X.Org が以下のエラーでコンパイルエラーになってしまう。

/var/tmp//ccLKDeC6.s: Assembler messages:
/var/tmp//ccLKDeC6.s:1212: Error: register or shift expression expected -- `orr r2,r0,lsl#16'
[中略]
--- autofit.o ---
*** [autofit.o] Error code 1
1 error

nbmake: stopped in /home/builds/ab/HEAD/src/external/mit/xorg/lib/freetype
--- dependall ---
*** [dependall] Error code 2
1 error

とりあえず対処方法。arm 用のインラインアセンブラを使わない様にしただけ。

Index: Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/freetype/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	1 May 2009 19:42:18 -0000	1.5
+++ Makefile	29 May 2009 22:07:24 -0000
@@ -98,6 +98,10 @@
 PKGDIST.freetype2=	${.CURDIR}
 PKGCONFIG_VERSION.freetype2=	9.20.3
 
+.if ${MACHINE_ARCH} == "arm" ||  ${MACHINE_ARCH} == "armeb"
+CPPFLAGS.libfreetype=-DFT_CONFIG_OPTION_NO_ASSEMBLER
+.endif
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
 .include <bsd.subdir.mk>