Rename libohash to libopenbsd.
libopenbsd is an internal library which to bring in compatibility stuff from OpenBSD. This will allow us to bring in more OpenBSD utilities into the FreeBSD base system. We similarly use libnetbsd for bringing in stuff from NetBSD. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D4078
This commit is contained in:
parent
0974676404
commit
cdebd14937
@ -1367,10 +1367,10 @@ _sed= usr.bin/sed
|
||||
.endif
|
||||
|
||||
.if ${BOOTSTRAPPING} < 1000002
|
||||
_libohash= lib/libohash
|
||||
_libopenbsd= lib/libopenbsd
|
||||
_m4= usr.bin/m4
|
||||
|
||||
${_bt}-usr.bin/m4: ${_bt}-lib/libohash
|
||||
${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd
|
||||
.endif
|
||||
|
||||
.if ${BOOTSTRAPPING} < 1000026
|
||||
@ -1443,10 +1443,10 @@ _kerberos5_bootstrap_tools= \
|
||||
.endif
|
||||
|
||||
.if ${MK_MANDOCDB} != "no"
|
||||
_libohash?= lib/libohash
|
||||
_libopenbsd?= lib/libopenbsd
|
||||
_makewhatis= lib/libsqlite3 \
|
||||
usr.bin/mandoc
|
||||
${_bt}-usr.bin/mandoc: ${_bt}-lib/libohash ${_bt}-lib/libsqlite3
|
||||
${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd ${_bt}-lib/libsqlite3
|
||||
.else
|
||||
_makewhatis=usr.bin/makewhatis
|
||||
.endif
|
||||
@ -1469,7 +1469,7 @@ bootstrap-tools: .PHONY
|
||||
${_awk} \
|
||||
${_cat} \
|
||||
usr.bin/lorder \
|
||||
${_libohash} \
|
||||
${_libopenbsd} \
|
||||
${_makewhatis} \
|
||||
usr.bin/rpcgen \
|
||||
${_sed} \
|
||||
|
@ -75,7 +75,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
|
||||
${_libnetgraph} \
|
||||
${_libngatm} \
|
||||
libnv \
|
||||
libohash \
|
||||
libopenbsd \
|
||||
libopie \
|
||||
libpam \
|
||||
libpcap \
|
||||
|
@ -1,6 +1,6 @@
|
||||
# $FreeBSD$
|
||||
|
||||
LIB= ohash
|
||||
LIB= openbsd
|
||||
SRCS= ohash.c
|
||||
INTERNALLIB=
|
||||
|
@ -39,7 +39,7 @@ _INTERNALLIBS= \
|
||||
netbsd \
|
||||
ntp \
|
||||
ntpevent \
|
||||
ohash \
|
||||
openbsd \
|
||||
opts \
|
||||
parse \
|
||||
readline \
|
||||
@ -313,8 +313,8 @@ LIBELFTC?= ${LIBELFTCDIR}/libelftc.a
|
||||
LIBREADLINEDIR= ${ROOTOBJDIR}/gnu/lib/libreadline/readline
|
||||
LIBREADLINE?= ${LIBREADLINEDIR}/libreadline.a
|
||||
|
||||
LIBOHASHDIR= ${ROOTOBJDIR}/lib/libohash
|
||||
LIBOHASH?= ${LIBOHASHDIR}/libohash.a
|
||||
LIBOPENBSDDIR= ${ROOTOBJDIR}/lib/libopenbsd
|
||||
LIBOPENBSD?= ${LIBOPENBSDDIR}/libopenbsd.a
|
||||
|
||||
LIBSMDIR= ${ROOTOBJDIR}/lib/libsm
|
||||
LIBSM?= ${LIBSMDIR}/libsm.a
|
||||
|
@ -7,8 +7,8 @@
|
||||
.include <src.opts.mk>
|
||||
|
||||
PROG= m4
|
||||
CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/../../lib/libohash
|
||||
LIBADD= y l m ohash
|
||||
CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/../../lib/libopenbsd
|
||||
LIBADD= y l m openbsd
|
||||
|
||||
NO_WMISSING_VARIABLE_DECLARATIONS=
|
||||
|
||||
|
@ -9,7 +9,7 @@ DIRDEPS = \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libohash \
|
||||
lib/libopenbsd \
|
||||
lib/liby \
|
||||
lib/msun \
|
||||
usr.bin/lex/lib \
|
||||
|
@ -82,8 +82,8 @@ SRCS+= ${DB_SRCS}
|
||||
|
||||
WARNS?= 2
|
||||
CFLAGS+= -DHAVE_CONFIG_H \
|
||||
-I${.CURDIR}/../../lib/libohash/ \
|
||||
-I${.CURDIR}/../../lib/libopenbsd/ \
|
||||
-I${.CURDIR}/../../contrib/sqlite3
|
||||
LIBADD= ohash sqlite3 z
|
||||
LIBADD= openbsd sqlite3 z
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -9,7 +9,7 @@ DIRDEPS = \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libohash \
|
||||
lib/libopenbsd \
|
||||
lib/libsqlite3 \
|
||||
lib/libthr \
|
||||
lib/libz \
|
||||
|
Loading…
Reference in New Issue
Block a user