Attachment 212670 Details for Bug 245027 – remove liby and libl

[patch] remove liby and libl

0001-Remove-liby-and-libl.patch (text/plain), 12.64 KB, created by Emmanuel Vadot on 2020-03-24 07:39:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emmanuel Vadot

Created: 2020-03-24 07:39:01 UTC

Size: 12.64 KB

patch

obsolete

>From 814db1a0dfc8742ccfffdd370c2a056dbf770d0b Mon Sep 17 00:00:00 2001
>From: Emmanuel Vadot <manu@freebsd.org>
>Date: Tue, 24 Mar 2020 08:09:07 +0100
>Subject: [PATCH] Remove liby and libl
>
>---
> Makefile.inc1                   |  9 ++----
> Makefile.libcompat              |  1 -
> ObsoleteFiles.inc               | 10 +++++++
> lib/Makefile                    |  1 -
> lib/liby/Makefile               |  8 ------
> lib/liby/Makefile.depend        | 12 --------
> lib/liby/main.c                 | 48 --------------------------------
> lib/liby/yyerror.c              | 49 ---------------------------------
> lib/liby/yyerror.h              | 36 ------------------------
> share/mk/bsd.suffixes.mk        |  4 +--
> share/mk/src.libnames.mk        |  2 --
> tools/make_libdeps.sh           |  1 -
> usr.bin/lex/Makefile            |  2 --
> usr.bin/lex/lib/Makefile        | 22 ---------------
> usr.bin/lex/lib/Makefile.depend | 11 --------
> 15 files changed, 15 insertions(+), 201 deletions(-)
> delete mode 100644 lib/liby/Makefile
> delete mode 100644 lib/liby/Makefile.depend
> delete mode 100644 lib/liby/main.c
> delete mode 100644 lib/liby/yyerror.c
> delete mode 100644 lib/liby/yyerror.h
> delete mode 100644 usr.bin/lex/lib/Makefile
> delete mode 100644 usr.bin/lex/lib/Makefile.depend
>
>diff --git a/Makefile.inc1 b/Makefile.inc1
>index baee5bfc2e0f..55a746dbfc92 100644
>--- a/Makefile.inc1
>+++ b/Makefile.inc1
>@@ -2073,7 +2073,7 @@ update: .PHONY
> 
> # libnv and libl are both requirements for config(8), which is an unconditional
> # bootstrap-tool.
>-_config_deps= lib/libnv usr.bin/lex/lib
>+_config_deps= lib/libnv
> 
> legacy: .PHONY
> .if ${BOOTSTRAPPING} < ${MINIMUM_SUPPORTED_OSREL} && ${BOOTSTRAPPING} != 0
>@@ -2217,10 +2217,7 @@ _kbdcontrol=	usr.sbin/kbdcontrol
> _bootstrap_tools_links+=kbdcontrol
> .endif
> 
>-_yacc=		lib/liby \
>-		usr.bin/yacc
>-
>-${_bt}-usr.bin/yacc: ${_bt}-lib/liby
>+_yacc=		usr.bin/yacc
> 
> .if ${MK_BSNMP} != "no"
> _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
>@@ -2840,7 +2837,7 @@ lib/libcasper__L: lib/libnv__L
> lib/liblzma__L: lib/libthr__L
> lib/libzstd__L: lib/libthr__L
> 
>-_generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
>+_generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib}
> .if ${MK_IPFILTER} != "no"
> _generic_libs+=	sbin/ipf/libipf
> .endif
>diff --git a/Makefile.libcompat b/Makefile.libcompat
>index 21e5fb4296a6..ad67fd114b34 100644
>--- a/Makefile.libcompat
>+++ b/Makefile.libcompat
>@@ -39,7 +39,6 @@ LIBCOMPATIMAKE+=	${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \
> 
> _LC_LIBDIRS.yes=		lib
> _LC_LIBDIRS.yes+=		gnu/lib
>-_LC_LIBDIRS.yes+=		usr.bin/lex/lib
> _LC_LIBDIRS.${MK_CDDL:tl}+=	cddl/lib
> _LC_LIBDIRS.${MK_CRYPT:tl}+=	secure/lib
> _LC_LIBDIRS.${MK_KERBEROS:tl}+=	kerberos5/lib
>diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
>index 94e4202bd640..b593d7a28ae1 100644
>--- a/ObsoleteFiles.inc
>+++ b/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
>+
> # 20200320: cx and ctau drivers retired
> OLD_FILES+=usr/share/man/man4/ctau.4.gz
> OLD_FILES+=usr/share/man/man4/cx.4.gz
>diff --git a/lib/Makefile b/lib/Makefile
>index ca881d6b0688..1bacd1c48a5d 100644
>--- a/lib/Makefile
>+++ b/lib/Makefile
>@@ -98,7 +98,6 @@ SUBDIR=	${SUBDIR_BOOTSTRAP} \
> 	${_libvgl} \
> 	libwrap \
> 	libxo \
>-	liby \
> 	libz \
> 	libzstd \
> 	ncurses
>diff --git a/lib/liby/Makefile b/lib/liby/Makefile
>deleted file mode 100644
>index 23e1197fa477..000000000000
>--- a/lib/liby/Makefile
>+++ /dev/null
>@@ -1,8 +0,0 @@
>-# $FreeBSD$
>-
>-PACKAGE=lib${LIB}
>-LIB=	y
>-SRCS=	main.c yyerror.c
>-NO_PIC=
>-
>-.include <bsd.lib.mk>
>diff --git a/lib/liby/Makefile.depend b/lib/liby/Makefile.depend
>deleted file mode 100644
>index 79506ce16b79..000000000000
>--- a/lib/liby/Makefile.depend
>+++ /dev/null
>@@ -1,12 +0,0 @@
>-# $FreeBSD$
>-# Autogenerated - do NOT edit!
>-
>-DIRDEPS = \
>-	include \
>-
>-
>-.include <dirdeps.mk>
>-
>-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
>-# local dependencies - needed for -jN in clean tree
>-.endif
>diff --git a/lib/liby/main.c b/lib/liby/main.c
>deleted file mode 100644
>index 7c3a6acf0ccc..000000000000
>--- a/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 <sys/cdefs.h>
>-__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 <stdlib.h>
>-
>-#include "yyerror.h"
>-
>-int
>-main(void)
>-{
>-
>-	exit(yyparse());
>-}
>diff --git a/lib/liby/yyerror.c b/lib/liby/yyerror.c
>deleted file mode 100644
>index 861ad5ad4c35..000000000000
>--- a/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 <sys/cdefs.h>
>-__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 <stdio.h>
>-
>-#include "yyerror.h"
>-
>-int
>-yyerror(const char *msg)
>-{
>-
>-	fprintf(stderr, "%s\n", msg);
>-	return(0);
>-}
>diff --git a/lib/liby/yyerror.h b/lib/liby/yyerror.h
>deleted file mode 100644
>index 74800b111ce6..000000000000
>--- a/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 */
>diff --git a/share/mk/bsd.suffixes.mk b/share/mk/bsd.suffixes.mk
>index 5396bae05087..43f8eaa2b1a8 100644
>--- a/share/mk/bsd.suffixes.mk
>+++ b/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}
>diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
>index bc9431f19db9..35ae2feb0bd7 100644
>--- a/share/mk/src.libnames.mk
>+++ b/share/mk/src.libnames.mk
>@@ -127,7 +127,6 @@ _LIBRARIES=	\
> 		kiconv \
> 		krb5 \
> 		kvm \
>-		l \
> 		lzma \
> 		m \
> 		magic \
>@@ -185,7 +184,6 @@ _LIBRARIES=	\
> 		wind \
> 		wrap \
> 		xo \
>-		y \
> 		ypclnt \
> 		z \
> 		zfs_core \
>diff --git a/tools/make_libdeps.sh b/tools/make_libdeps.sh
>index 77525093bbd7..8827ade52f0d 100644
>--- a/tools/make_libdeps.sh
>+++ b/tools/make_libdeps.sh
>@@ -40,7 +40,6 @@ LIBS="
> 	gnu/lib
> 	kerberos5/lib
> 	secure/lib
>-	usr.bin/lex/lib
> 	cddl/lib
> 	contrib/ofed
> "				# where to scan for libraries
>diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
>index 473b08928681..d8ad3e2c901f 100644
>--- a/usr.bin/lex/Makefile
>+++ b/usr.bin/lex/Makefile
>@@ -37,8 +37,6 @@ NO_WMISLEADING_INDENTATION=
> 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
>diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile
>deleted file mode 100644
>index 0bca11f2113e..000000000000
>--- a/usr.bin/lex/lib/Makefile
>+++ /dev/null
>@@ -1,22 +0,0 @@
>-# $FreeBSD$
>-
>-.include <src.opts.mk>
>-
>-.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 <bsd.lib.mk>
>-
>diff --git a/usr.bin/lex/lib/Makefile.depend b/usr.bin/lex/lib/Makefile.depend
>deleted file mode 100644
>index f80275d86ab1..000000000000
>--- a/usr.bin/lex/lib/Makefile.depend
>+++ /dev/null
>@@ -1,11 +0,0 @@
>-# $FreeBSD$
>-# Autogenerated - do NOT edit!
>-
>-DIRDEPS = \
>-
>-
>-.include <dirdeps.mk>
>-
>-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
>-# local dependencies - needed for -jN in clean tree
>-.endif
>-- 
>2.20.1
>

Actions: View | Diff

Attachments on bug 245027: 212670 | 212722