svn commit: r290351 - in head: . lib lib/libohash lib/libopenbsd share/mk usr.bin/m4 usr.bin/mandoc
Craig Rodrigues
rodrigc at FreeBSD.org
Wed Nov 4 07:20:58 UTC 2015
Author: rodrigc
Date: Wed Nov 4 07:20:55 2015
New Revision: 290351
URL: https://svnweb.freebsd.org/changeset/base/290351
Log:
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
Added:
head/lib/libopenbsd/
- copied from r290350, head/lib/libohash/
Deleted:
head/lib/libohash/
Modified:
head/Makefile.inc1
head/lib/Makefile
head/lib/libopenbsd/Makefile
head/share/mk/src.libnames.mk
head/usr.bin/m4/Makefile
head/usr.bin/m4/Makefile.depend
head/usr.bin/mandoc/Makefile
head/usr.bin/mandoc/Makefile.depend
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Wed Nov 4 05:38:08 2015 (r290350)
+++ head/Makefile.inc1 Wed Nov 4 07:20:55 2015 (r290351)
@@ -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} \
Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile Wed Nov 4 05:38:08 2015 (r290350)
+++ head/lib/Makefile Wed Nov 4 07:20:55 2015 (r290351)
@@ -75,7 +75,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
${_libnetgraph} \
${_libngatm} \
libnv \
- libohash \
+ libopenbsd \
libopie \
libpam \
libpcap \
Modified: head/lib/libopenbsd/Makefile
==============================================================================
--- head/lib/libohash/Makefile Wed Nov 4 05:38:08 2015 (r290350)
+++ head/lib/libopenbsd/Makefile Wed Nov 4 07:20:55 2015 (r290351)
@@ -1,6 +1,6 @@
# $FreeBSD$
-LIB= ohash
+LIB= openbsd
SRCS= ohash.c
INTERNALLIB=
Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk Wed Nov 4 05:38:08 2015 (r290350)
+++ head/share/mk/src.libnames.mk Wed Nov 4 07:20:55 2015 (r290351)
@@ -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
Modified: head/usr.bin/m4/Makefile
==============================================================================
--- head/usr.bin/m4/Makefile Wed Nov 4 05:38:08 2015 (r290350)
+++ head/usr.bin/m4/Makefile Wed Nov 4 07:20:55 2015 (r290351)
@@ -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=
Modified: head/usr.bin/m4/Makefile.depend
==============================================================================
--- head/usr.bin/m4/Makefile.depend Wed Nov 4 05:38:08 2015 (r290350)
+++ head/usr.bin/m4/Makefile.depend Wed Nov 4 07:20:55 2015 (r290351)
@@ -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 \
Modified: head/usr.bin/mandoc/Makefile
==============================================================================
--- head/usr.bin/mandoc/Makefile Wed Nov 4 05:38:08 2015 (r290350)
+++ head/usr.bin/mandoc/Makefile Wed Nov 4 07:20:55 2015 (r290351)
@@ -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>
Modified: head/usr.bin/mandoc/Makefile.depend
==============================================================================
--- head/usr.bin/mandoc/Makefile.depend Wed Nov 4 05:38:08 2015 (r290350)
+++ head/usr.bin/mandoc/Makefile.depend Wed Nov 4 07:20:55 2015 (r290351)
@@ -9,7 +9,7 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libohash \
+ lib/libopenbsd \
lib/libsqlite3 \
lib/libthr \
lib/libz \
More information about the svn-src-all
mailing list