View | Details | Raw Unified | Return to bug 245027 | Differences between
and this patch

Collapse All | Expand All

(-)b/Makefile.inc1 (-6 / +3 lines)
Lines 2073-2079 update: .PHONY Link Here
2073
2073
2074
# libnv and libl are both requirements for config(8), which is an unconditional
2074
# libnv and libl are both requirements for config(8), which is an unconditional
2075
# bootstrap-tool.
2075
# bootstrap-tool.
2076
_config_deps= lib/libnv usr.bin/lex/lib
2076
_config_deps= lib/libnv
2077
2077
2078
legacy: .PHONY
2078
legacy: .PHONY
2079
.if ${BOOTSTRAPPING} < ${MINIMUM_SUPPORTED_OSREL} && ${BOOTSTRAPPING} != 0
2079
.if ${BOOTSTRAPPING} < ${MINIMUM_SUPPORTED_OSREL} && ${BOOTSTRAPPING} != 0
Lines 2217-2226 _kbdcontrol= usr.sbin/kbdcontrol Link Here
2217
_bootstrap_tools_links+=kbdcontrol
2217
_bootstrap_tools_links+=kbdcontrol
2218
.endif
2218
.endif
2219
2219
2220
_yacc=		lib/liby \
2220
_yacc=		usr.bin/yacc
2221
		usr.bin/yacc
2222
2223
${_bt}-usr.bin/yacc: ${_bt}-lib/liby
2224
2221
2225
.if ${MK_BSNMP} != "no"
2222
.if ${MK_BSNMP} != "no"
2226
_gensnmptree=	usr.sbin/bsnmpd/gensnmptree
2223
_gensnmptree=	usr.sbin/bsnmpd/gensnmptree
Lines 2840-2846 lib/libcasper__L: lib/libnv__L Link Here
2840
lib/liblzma__L: lib/libthr__L
2837
lib/liblzma__L: lib/libthr__L
2841
lib/libzstd__L: lib/libthr__L
2838
lib/libzstd__L: lib/libthr__L
2842
2839
2843
_generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
2840
_generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib}
2844
.if ${MK_IPFILTER} != "no"
2841
.if ${MK_IPFILTER} != "no"
2845
_generic_libs+=	sbin/ipf/libipf
2842
_generic_libs+=	sbin/ipf/libipf
2846
.endif
2843
.endif
(-)b/Makefile.libcompat (-1 lines)
Lines 39-45 LIBCOMPATIMAKE+= ${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \ Link Here
39
39
40
_LC_LIBDIRS.yes=		lib
40
_LC_LIBDIRS.yes=		lib
41
_LC_LIBDIRS.yes+=		gnu/lib
41
_LC_LIBDIRS.yes+=		gnu/lib
42
_LC_LIBDIRS.yes+=		usr.bin/lex/lib
43
_LC_LIBDIRS.${MK_CDDL:tl}+=	cddl/lib
42
_LC_LIBDIRS.${MK_CDDL:tl}+=	cddl/lib
44
_LC_LIBDIRS.${MK_CRYPT:tl}+=	secure/lib
43
_LC_LIBDIRS.${MK_CRYPT:tl}+=	secure/lib
45
_LC_LIBDIRS.${MK_KERBEROS:tl}+=	kerberos5/lib
44
_LC_LIBDIRS.${MK_KERBEROS:tl}+=	kerberos5/lib
(-)b/ObsoleteFiles.inc (+10 lines)
Lines 36-41 Link Here
36
#   xargs -n1 | sort | uniq -d;
36
#   xargs -n1 | sort | uniq -d;
37
# done
37
# done
38
38
39
# 20200324: Remove liby and libl
40
OLD_FILES+=usr/lib/libfl_p.a
41
OLD_FILES+=usr/lib/libfl.a
42
OLD_FILES+=usr/lib/libl_p.a
43
OLD_FILES+=usr/lib/libl.a
44
OLD_FILES+=usr/lib/libln_p.a
45
OLD_FILES+=usr/lib/libln.a
46
OLD_FILES+=usr/lib/liby_p.a
47
OLD_FILES+=usr/lib/liby.a
48
39
# 20200320: cx and ctau drivers retired
49
# 20200320: cx and ctau drivers retired
40
OLD_FILES+=usr/share/man/man4/ctau.4.gz
50
OLD_FILES+=usr/share/man/man4/ctau.4.gz
41
OLD_FILES+=usr/share/man/man4/cx.4.gz
51
OLD_FILES+=usr/share/man/man4/cx.4.gz
(-)b/lib/Makefile (-1 lines)
Lines 98-104 SUBDIR= ${SUBDIR_BOOTSTRAP} \ Link Here
98
	${_libvgl} \
98
	${_libvgl} \
99
	libwrap \
99
	libwrap \
100
	libxo \
100
	libxo \
101
	liby \
102
	libz \
101
	libz \
103
	libzstd \
102
	libzstd \
104
	ncurses
103
	ncurses
(-)a/lib/liby/Makefile (-8 lines)
Removed Link Here
1
# $FreeBSD$
2
3
PACKAGE=lib${LIB}
4
LIB=	y
5
SRCS=	main.c yyerror.c
6
NO_PIC=
7
8
.include <bsd.lib.mk>
(-)a/lib/liby/Makefile.depend (-12 lines)
Removed Link Here
1
# $FreeBSD$
2
# Autogenerated - do NOT edit!
3
4
DIRDEPS = \
5
	include \
6
7
8
.include <dirdeps.mk>
9
10
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
11
# local dependencies - needed for -jN in clean tree
12
.endif
(-)a/lib/liby/main.c (-48 lines)
Removed Link Here
1
/*-
2
 * SPDX-License-Identifier: BSD-3-Clause
3
 *
4
 * Copyright (c) 1990, 1993
5
 *	The Regents of the University of California.  All rights reserved.
6
 *
7
 * Redistribution and use in source and binary forms, with or without
8
 * modification, are permitted provided that the following conditions
9
 * are met:
10
 * 1. Redistributions of source code must retain the above copyright
11
 *    notice, this list of conditions and the following disclaimer.
12
 * 2. Redistributions in binary form must reproduce the above copyright
13
 *    notice, this list of conditions and the following disclaimer in the
14
 *    documentation and/or other materials provided with the distribution.
15
 * 3. Neither the name of the University nor the names of its contributors
16
 *    may be used to endorse or promote products derived from this software
17
 *    without specific prior written permission.
18
 *
19
 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
23
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29
 * SUCH DAMAGE.
30
 */
31
32
#include <sys/cdefs.h>
33
__FBSDID("$FreeBSD$");
34
35
#if defined(LIBC_SCCS) && !defined(lint)
36
static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/4/93";
37
#endif /* LIBC_SCCS and not lint */
38
39
#include <stdlib.h>
40
41
#include "yyerror.h"
42
43
int
44
main(void)
45
{
46
47
	exit(yyparse());
48
}
(-)a/lib/liby/yyerror.c (-49 lines)
Removed Link Here
1
/*-
2
 * SPDX-License-Identifier: BSD-3-Clause
3
 *
4
 * Copyright (c) 1990, 1993
5
 *	The Regents of the University of California.  All rights reserved.
6
 *
7
 * Redistribution and use in source and binary forms, with or without
8
 * modification, are permitted provided that the following conditions
9
 * are met:
10
 * 1. Redistributions of source code must retain the above copyright
11
 *    notice, this list of conditions and the following disclaimer.
12
 * 2. Redistributions in binary form must reproduce the above copyright
13
 *    notice, this list of conditions and the following disclaimer in the
14
 *    documentation and/or other materials provided with the distribution.
15
 * 3. Neither the name of the University nor the names of its contributors
16
 *    may be used to endorse or promote products derived from this software
17
 *    without specific prior written permission.
18
 *
19
 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
20
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
23
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29
 * SUCH DAMAGE.
30
 */
31
32
#include <sys/cdefs.h>
33
__FBSDID("$FreeBSD$");
34
35
#if defined(LIBC_SCCS) && !defined(lint)
36
static char sccsid[] = "@(#)yyerror.c	8.1 (Berkeley) 6/4/93";
37
#endif /* LIBC_SCCS and not lint */
38
39
#include <stdio.h>
40
41
#include "yyerror.h"
42
43
int
44
yyerror(const char *msg)
45
{
46
47
	fprintf(stderr, "%s\n", msg);
48
	return(0);
49
}
(-)a/lib/liby/yyerror.h (-36 lines)
Removed Link Here
1
/*-
2
 * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
3
 *
4
 * Copyright (c) 2018 Eitan Adler
5
 *
6
 * Redistribution and use in source and binary forms, with or without
7
 * modification, are permitted provided that the following conditions
8
 * are met:
9
 * 1. Redistributions of source code must retain the above copyright
10
 *    notice, this list of conditions and the following disclaimer.
11
 * 2. Redistributions in binary form must reproduce the above copyright
12
 *    notice, this list of conditions and the following disclaimer in the
13
 *    documentation and/or other materials provided with the distribution.
14
 *
15
 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
16
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
18
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
19
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25
 * SUCH DAMAGE.
26
 *
27
 * $FreeBSD$
28
 */
29
30
#ifndef YYERROR_H
31
#define YYERROR_H
32
33
int yyerror(const char *msg);
34
int yyparse(void);
35
36
#endif /* YYERROR_H */
(-)b/share/mk/bsd.suffixes.mk (-2 / +2 lines)
Lines 92-103 Link Here
92
# XXX not -j safe
92
# XXX not -j safe
93
.y.out:
93
.y.out:
94
	${YACC} ${YFLAGS} ${.IMPSRC}
94
	${YACC} ${YFLAGS} ${.IMPSRC}
95
	${CC} ${CFLAGS} ${LDFLAGS} y.tab.c ${LDLIBS} -ly -o ${.TARGET}
95
	${CC} ${CFLAGS} ${LDFLAGS} y.tab.c ${LDLIBS} -o ${.TARGET}
96
	rm -f y.tab.c
96
	rm -f y.tab.c
97
	${CTFCONVERT_CMD}
97
	${CTFCONVERT_CMD}
98
98
99
.l.out:
99
.l.out:
100
	${LEX} -t ${LFLAGS} ${.IMPSRC} > ${.PREFIX}.tmp.c
100
	${LEX} -t ${LFLAGS} ${.IMPSRC} > ${.PREFIX}.tmp.c
101
	${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET}
101
	${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -o ${.TARGET}
102
	rm -f ${.PREFIX}.tmp.c
102
	rm -f ${.PREFIX}.tmp.c
103
	${CTFCONVERT_CMD}
103
	${CTFCONVERT_CMD}
(-)b/share/mk/src.libnames.mk (-2 lines)
Lines 127-133 _LIBRARIES= \ Link Here
127
		kiconv \
127
		kiconv \
128
		krb5 \
128
		krb5 \
129
		kvm \
129
		kvm \
130
		l \
131
		lzma \
130
		lzma \
132
		m \
131
		m \
133
		magic \
132
		magic \
Lines 185-191 _LIBRARIES= \ Link Here
185
		wind \
184
		wind \
186
		wrap \
185
		wrap \
187
		xo \
186
		xo \
188
		y \
189
		ypclnt \
187
		ypclnt \
190
		z \
188
		z \
191
		zfs_core \
189
		zfs_core \
(-)b/tools/make_libdeps.sh (-1 lines)
Lines 40-46 LIBS=" Link Here
40
	gnu/lib
40
	gnu/lib
41
	kerberos5/lib
41
	kerberos5/lib
42
	secure/lib
42
	secure/lib
43
	usr.bin/lex/lib
44
	cddl/lib
43
	cddl/lib
45
	contrib/ofed
44
	contrib/ofed
46
"				# where to scan for libraries
45
"				# where to scan for libraries
(-)b/usr.bin/lex/Makefile (-2 lines)
Lines 37-44 NO_WMISLEADING_INDENTATION= Link Here
37
CLEANFILES=	scan.c skel.c
37
CLEANFILES=	scan.c skel.c
38
GENFILES=	parse.c parse.h scan.c skel.c
38
GENFILES=	parse.c parse.h scan.c skel.c
39
39
40
SUBDIR=		lib
41
42
FLEX_VERSION=	`awk -f ${.CURDIR}/version.awk ${.CURDIR}/config.h`
40
FLEX_VERSION=	`awk -f ${.CURDIR}/version.awk ${.CURDIR}/config.h`
43
41
44
skel.c: config.h mkskel.sh flex.skl version.awk
42
skel.c: config.h mkskel.sh flex.skl version.awk
(-)a/usr.bin/lex/lib/Makefile (-22 lines)
Removed Link Here
1
# $FreeBSD$
2
3
.include <src.opts.mk>
4
5
.PATH:	${SRCTOP}/contrib/flex
6
7
LIB=    ln
8
SRCS=   libmain.c libyywrap.c
9
NO_PIC=
10
11
.if ${MK_INSTALLLIB} != "no"
12
LINKS=  ${LIBDIR}/libln.a ${LIBDIR}/libl.a
13
LINKS+=	${LIBDIR}/libln.a ${LIBDIR}/libfl.a
14
.endif
15
16
.if ${MK_PROFILE} != "no"
17
LINKS+= ${LIBDIR}/libln_p.a ${LIBDIR}/libl_p.a
18
LINKS+=	${LIBDIR}/libln_p.a ${LIBDIR}/libfl_p.a
19
.endif
20
21
.include <bsd.lib.mk>
22
(-)a/usr.bin/lex/lib/Makefile.depend (-12 lines)
Removed Link Here
1
# $FreeBSD$
2
# Autogenerated - do NOT edit!
3
4
DIRDEPS = \
5
6
7
.include <dirdeps.mk>
8
9
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
10
# local dependencies - needed for -jN in clean tree
11
.endif
12
- 

Return to bug 245027