NetBSD-Bugs archive

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

Re: bin/44138: netbsd-5-1-RELEASE: crossbuild failed on Linux



> - src/tools/compat/README should mention bzip2 headers are need
> for crossbuilding NetBSD 5.1 src+xsrc on Linux
> (but were not need with 5.0.2).
> 
> - src/external/mit/xorg/tools/bdftopcf/Makefile should include
> "-I${DESTDIR}/usr/include" (but should exist a variable for that)

I doubt we really need bzip2 support in tools bdftopcf.
(we only have .gz fonts and use gzip(1) command to generate them)

How about the following patch for tools bdftopcf?

Index: external/mit/xorg/tools/bdftopcf/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/tools/bdftopcf/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- external/mit/xorg/tools/bdftopcf/Makefile   14 Aug 2010 11:12:16 -0000      
1.4
+++ external/mit/xorg/tools/bdftopcf/Makefile   18 Dec 2010 13:04:23 -0000
@@ -16,7 +16,7 @@ HOST_CPPFLAGS+=       -I${DESTDIR}${X11INCDIR}
                -I${DESTDIR}${X11INCDIR}/X11/fonts \
                -I${DESTDIR}${X11INCDIR}/freetype2 \
                -I${X11SRCDIR.Xfont}/src/stubs \
-               -DBDFFORMAT -DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION 
-DX_BZIP2_FONT_COMPRESSION \
+               -DBDFFORMAT -DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION \
                
-DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\"
 
 .PATH:         ${X11SRCDIR.Xfont}/src/bitmap
@@ -24,12 +24,12 @@ SRCS+=              bdfread.c bdfutils.c bitmap.c bi
                pcfread.c pcfwrite.c
 
 .PATH:         ${X11SRCDIR.Xfont}/src/fontfile
-SRCS+=         bufio.c decompress.c defaults.c fileio.c filewr.c gunzip.c 
bunzip2.c
+SRCS+=         bufio.c decompress.c defaults.c fileio.c filewr.c gunzip.c
 
 .PATH:         ${X11SRCDIR.Xfont}/src/util
 SRCS+=         atom.c fontaccel.c private.c utilbitmap.c
 
-LDADD+=                -lz -lbz2
+LDADD+=                -lz
 
 .include <bsd.x11.mk>
 .include <bsd.hostprog.mk>

---
Izumi Tsutsui



Home | Main Index | Thread Index | Old Index