Module Name: src
Committed By: kamil
Date: Sat Mar 31 14:24:54 UTC 2018
Modified Files:
src/lib/libc: Makefile
src/share/mk: bsd.own.mk
Log Message:
Drop the USE_LIBTRE build option
libtre cannot be used any more as a replacement for regex(3).
Tt does not build and the library development is stalled in upstream.
Proposed on mailing list.
Sponsored by <The NetBSD Foundation>
To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/lib/libc/Makefile
cvs rdiff -u -r1.1051 -r1.1052 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/Makefile
diff -u src/lib/libc/Makefile:1.169 src/lib/libc/Makefile:1.170
--- src/lib/libc/Makefile:1.169 Mon Jun 15 14:24:01 2015
+++ src/lib/libc/Makefile Sat Mar 31 14:24:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.169 2015/06/15 14:24:01 christos Exp $
+# $NetBSD: Makefile,v 1.170 2018/03/31 14:24:54 kamil Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -76,11 +76,7 @@ CPPFLAGS+= -D__BUILD_LEGACY
.include "${.CURDIR}/net/Makefile.inc"
.include "${.CURDIR}/nameser/Makefile.inc"
.include "${.CURDIR}/nls/Makefile.inc"
-.if (${USE_LIBTRE} == "yes")
-.include "${NETBSDSRCDIR}/external/bsd/tre/Makefile.inc"
-.else
.include "${.CURDIR}/regex/Makefile.inc"
-.endif
.include "${.CURDIR}/resolv/Makefile.inc"
.include "${.CURDIR}/rpc/Makefile.inc"
.include "${.CURDIR}/ssp/Makefile.inc"
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1051 src/share/mk/bsd.own.mk:1.1052
--- src/share/mk/bsd.own.mk:1.1051 Thu Mar 15 13:44:45 2018
+++ src/share/mk/bsd.own.mk Sat Mar 31 14:24:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1051 2018/03/15 13:44:45 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1052 2018/03/31 14:24:54 kamil Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1339,7 +1339,7 @@ ${var}?= yes
# USE_* options which default to "no".
#
# For now, disable pigz as compressor by default
-.for var in USE_PIGZGZIP USE_LIBTRE
+.for var in USE_PIGZGZIP
${var}?= no
.endfor
