Index: ObsoleteFiles.inc =================================================================== --- ObsoleteFiles.inc +++ ObsoleteFiles.inc @@ -36,6 +36,16 @@ # xargs -n1 | sort | uniq -d; # done +# 20200324: Remove liby and libl +OLD_FILES+=usr/lib/libfl_p.a +OLD_FILES+=usr/lib/libfl.a +OLD_FILES+=usr/lib/libl_p.a +OLD_FILES+=usr/lib/libl.a +OLD_FILES+=usr/lib/libln_p.a +OLD_FILES+=usr/lib/libln.a +OLD_FILES+=usr/lib/liby_p.a +OLD_FILES+=usr/lib/liby.a + # 20200323: INTERNALLIB don't install headers anymore OLD_FILES+=usr/include/libelftc.h OLD_FILES+=usr/include/libifconfig.h Index: lib/Makefile =================================================================== --- lib/Makefile +++ lib/Makefile @@ -98,7 +98,6 @@ ${_libvgl} \ libwrap \ libxo \ - liby \ libz \ libzstd \ ncurses Index: lib/liby/Makefile =================================================================== --- lib/liby/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -PACKAGE=lib${LIB} -LIB= y -SRCS= main.c yyerror.c -NO_PIC= - -.include Index: lib/liby/Makefile.depend =================================================================== --- lib/liby/Makefile.depend +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - include \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif Index: lib/liby/main.c =================================================================== --- lib/liby/main.c +++ /dev/null @@ -1,48 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-3-Clause - * - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -__FBSDID("$FreeBSD$"); - -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ - -#include - -#include "yyerror.h" - -int -main(void) -{ - - exit(yyparse()); -} Index: lib/liby/yyerror.h =================================================================== --- lib/liby/yyerror.h +++ /dev/null @@ -1,36 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2018 Eitan Adler - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef YYERROR_H -#define YYERROR_H - -int yyerror(const char *msg); -int yyparse(void); - -#endif /* YYERROR_H */ Index: lib/liby/yyerror.c =================================================================== --- lib/liby/yyerror.c +++ /dev/null @@ -1,49 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-3-Clause - * - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -__FBSDID("$FreeBSD$"); - -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)yyerror.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ - -#include - -#include "yyerror.h" - -int -yyerror(const char *msg) -{ - - fprintf(stderr, "%s\n", msg); - return(0); -} Index: share/mk/bsd.suffixes.mk =================================================================== --- share/mk/bsd.suffixes.mk +++ share/mk/bsd.suffixes.mk @@ -92,12 +92,12 @@ # XXX not -j safe .y.out: ${YACC} ${YFLAGS} ${.IMPSRC} - ${CC} ${CFLAGS} ${LDFLAGS} y.tab.c ${LDLIBS} -ly -o ${.TARGET} + ${CC} ${CFLAGS} ${LDFLAGS} y.tab.c ${LDLIBS} -o ${.TARGET} rm -f y.tab.c ${CTFCONVERT_CMD} .l.out: ${LEX} -t ${LFLAGS} ${.IMPSRC} > ${.PREFIX}.tmp.c - ${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET} + ${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -o ${.TARGET} rm -f ${.PREFIX}.tmp.c ${CTFCONVERT_CMD} Index: share/mk/src.libnames.mk =================================================================== --- share/mk/src.libnames.mk +++ share/mk/src.libnames.mk @@ -134,7 +134,6 @@ kiconv \ krb5 \ kvm \ - l \ lzma \ m \ magic \ @@ -192,7 +191,6 @@ wind \ wrap \ xo \ - y \ ypclnt \ z \ zfs_core \ Index: tools/make_libdeps.sh =================================================================== --- tools/make_libdeps.sh +++ tools/make_libdeps.sh @@ -40,7 +40,6 @@ gnu/lib kerberos5/lib secure/lib - usr.bin/lex/lib cddl/lib contrib/ofed " # where to scan for libraries Index: usr.bin/lex/Makefile =================================================================== --- usr.bin/lex/Makefile +++ usr.bin/lex/Makefile @@ -37,8 +37,6 @@ CLEANFILES= scan.c skel.c GENFILES= parse.c parse.h scan.c skel.c -SUBDIR= lib - FLEX_VERSION= `awk -f ${.CURDIR}/version.awk ${.CURDIR}/config.h` skel.c: config.h mkskel.sh flex.skl version.awk Index: usr.bin/lex/lib/Makefile =================================================================== --- usr.bin/lex/lib/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# $FreeBSD$ - -.include - -.PATH: ${SRCTOP}/contrib/flex - -LIB= ln -SRCS= libmain.c libyywrap.c -NO_PIC= - -.if ${MK_INSTALLLIB} != "no" -LINKS= ${LIBDIR}/libln.a ${LIBDIR}/libl.a -LINKS+= ${LIBDIR}/libln.a ${LIBDIR}/libfl.a -.endif - -.if ${MK_PROFILE} != "no" -LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libl_p.a -LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libfl_p.a -.endif - -.include - Index: usr.bin/lex/lib/Makefile.depend =================================================================== --- usr.bin/lex/lib/Makefile.depend +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif