Module Name: src
Committed By: mrg
Date: Fri Jun 18 05:26:12 UTC 2010
Modified Files:
src/external/zlib/pigz/bin/pigz: Makefile
Added Files:
src/tools/pigz: Makefile
Log Message:
add support to build pigz as a host tool.
still missing:
- TOOL_PIGZ
- support to use it instead of the host's "gzip"
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/zlib/pigz/bin/pigz/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/pigz/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/zlib/pigz/bin/pigz/Makefile
diff -u src/external/zlib/pigz/bin/pigz/Makefile:1.2 src/external/zlib/pigz/bin/pigz/Makefile:1.3
--- src/external/zlib/pigz/bin/pigz/Makefile:1.2 Fri Jun 18 04:21:23 2010
+++ src/external/zlib/pigz/bin/pigz/Makefile Fri Jun 18 05:26:12 2010
@@ -1,4 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/06/18 04:21:23 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/18 05:26:12 mrg Exp $
+
+.ifdef HOSTPROG
+
+.include <bsd.own.mk>
BINDIR= /usr/bin
@@ -37,3 +41,21 @@
.PATH: ${DIST}
GZIPDIST= ${NETBSDSRCDIR}/usr.bin/gzip
.PATH: ${GZIPDIST}
+
+.else # HOSTPROG
+
+SRCS= pigz.c
+
+HOST_LDFLAGS= -lz
+
+#HAVE_PTHREAD_H!= if echo '#include <pthread.h>' | ${HOST_CC} -E - > /dev/null; then echo yes; else echo no; fi
+HAVE_PTHREAD_H?= yes
+
+.if ${HAVE_PTHREAD_H} != "no"
+SRCS+= yarn.c
+HOST_LDFLAGS+= -lpthread
+.else
+HOST_CPPFLAGS+= -DNOTHREAD
+.endif
+
+.endif # HOSTPROG
Added files:
Index: src/tools/pigz/Makefile
diff -u /dev/null src/tools/pigz/Makefile:1.1
--- /dev/null Fri Jun 18 05:26:12 2010
+++ src/tools/pigz/Makefile Fri Jun 18 05:26:12 2010
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2010/06/18 05:26:12 mrg Exp $
+
+HOSTPROGNAME= ${_TOOL_PREFIX}pigz
+HOST_SRCDIR= external/zlib/pigz/bin/pigz
+
+.include "${.CURDIR}/../Makefile.host"
