Module Name: src
Committed By: tsutsui
Date: Wed Aug 10 10:34:49 UTC 2011
Modified Files:
src/external/mit/xorg/tools/fc-cache: Makefile
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
Disable bzip2 support in freetype on xorg tools build.
Fixes PR xsrc/45223 (xorg tools build fails on CentOS due to
lack of bz2 support).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/fc-cache/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/tools/mkfontscale/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.4 src/external/mit/xorg/tools/fc-cache/Makefile:1.5
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.4 Sat Jul 23 23:42:02 2011
+++ src/external/mit/xorg/tools/fc-cache/Makefile Wed Aug 10 10:34:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/07/23 23:42:02 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/08/10 10:34:48 tsutsui Exp $
NOMAN= 1
@@ -39,8 +39,8 @@
.PATH: ${FREETYPE}/src/gzip
SRCS.freetype+= ftgzip.c
-.PATH: ${FREETYPE}/src/bzip2
-SRCS.freetype+= ftbzip2.c
+#.PATH: ${FREETYPE}/src/bzip2
+#SRCS.freetype+= ftbzip2.c
.PATH: ${FREETYPE}/src/lzw
SRCS.freetype+= ftlzw.c
@@ -100,12 +100,14 @@
-DFT2_BUILD_LIBRARY \
-DXML_BYTE_ORDER=0 -DHAVE_MEMMOVE=1 \
-DHAVE_STDINT_H -DHAVE_RANDOM -DDARWIN_NO_CARBON
+HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREETYPE} \
-I${FREETYPE}/include -I${EXPAT}/lib \
-I${FONTCONFIG}/../include \
-I${DESTDIR}${X11INCDIR} -I.
-LDADD= -lz -lbz2
+LDADD= -lz
+#LDADD+= -lbz2
FCARCH_DEPFILE= fc-cache.c
.include "../../lib/fontconfig/src/Makefile.fcarch"
Index: src/external/mit/xorg/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.3 src/external/mit/xorg/tools/mkfontscale/Makefile:1.4
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.3 Sat Jul 23 23:42:02 2011
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Wed Aug 10 10:34:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/07/23 23:42:02 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/10 10:34:48 tsutsui Exp $
NOMAN= 1
@@ -31,8 +31,8 @@
.PATH: ${FREETYPE}/src/gzip
SRCS.freetype+= ftgzip.c
-.PATH: ${FREETYPE}/src/bzip2
-SRCS.freetype+= ftbzip2.c
+#.PATH: ${FREETYPE}/src/bzip2
+#SRCS.freetype+= ftbzip2.c
.PATH: ${FREETYPE}/src/lzw
SRCS.freetype+= ftlzw.c
@@ -78,11 +78,13 @@
SRCS+= ${SRCS.mkfontscale} ${SRCS.freetype} ${SRCS.fontenc}
-LDADD= -lz -lbz2
+LDADD= -lz
+#LDADD+= -lbz2
HOST_CPPFLAGS= -DFONTENC_NO_LIBFONT -DXFREE86_FT2 -DFONTENC_NO_LIBFONT \
-DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON \
-DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\"
+HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
HOST_CPPFLAGS+= -I${FREETYPE}/include -I${DESTDIR}${X11INCDIR} \
-I${DESTDIR}${X11INCDIR}/freetype2
# -I${X11SRCDIR.xc}/include/fonts
