From: zrj Date: Tue, 30 Apr 2019 07:28:00 +0000 (+0300) Subject: libedit: Privatize the last public header. X-Git-Tag: v5.7.0~165 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/fc4af96729edcebb7aba13aeec8a71ba85e1e4b1 libedit: Privatize the last public header. Adjust all cases to include correct histedit.h header. --- diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index e1d83f28c3..14e7ea1e39 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -3646,6 +3646,7 @@ TO_REMOVE+=/usr/lib/profile/libcipher.a TO_REMOVE+=/usr/share/man/man3/cipher.3.gz TO_REMOVE+=/usr/share/man/man3/des_cipher.3.gz TO_REMOVE+=/usr/share/man/man3/des_setkey.3.gz +TO_REMOVE+=/usr/include/histedit.h .if !defined(WANT_INSTALLER) TO_REMOVE+=/usr/sbin/dfuibe_installer diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 71fd608a5e..2356370682 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -30,6 +30,7 @@ CFLAGS+=-DSHELL -I. -I${.CURDIR} CFLAGS+= -DNO_HISTORY # LIBEDIT is not needed here .else +CFLAGS+= ${PRIVATELIB_CFLAGS} DPADD= ${LIBEDIT} ${LIBNCURSES} LDADD= ${LIBEDIT} ${LIBNCURSES} .endif diff --git a/gnu/sbin/lvm/Makefile b/gnu/sbin/lvm/Makefile index 9ca6393936..c885159af8 100644 --- a/gnu/sbin/lvm/Makefile +++ b/gnu/sbin/lvm/Makefile @@ -34,9 +34,10 @@ CFLAGS+= -Wno-stack-protector # Do not build readline support for the rescue version. # .if !defined(RESCUE) -CFLAGS+= -DREADLINE_SUPPORT -I${_SHLIBDIRPREFIX}/usr/include/priv -LDADD+= -lprivate_edit -lprivate_ncurses +CFLAGS+= -DREADLINE_SUPPORT +CFLAGS+= ${PRIVATELIB_CFLAGS} DPADD+= ${LIBEDIT} ${LIBNCURSES} +LDADD+= -lprivate_edit -lprivate_ncurses LDFLAGS+= ${PRIVATELIB_LDFLAGS} .endif diff --git a/lib/libedit/libedit/Makefile b/lib/libedit/libedit/Makefile index 81d726a7e4..26dd106494 100644 --- a/lib/libedit/libedit/Makefile +++ b/lib/libedit/libedit/Makefile @@ -48,6 +48,7 @@ SRCS+= common.h emacs.h fcns.h help.h vi.h SRCS+= fcns.c help.c tokenizern.c historyn.c INCS= histedit.h +INCSDIR= ${INCLUDEDIR}/priv MAN= editrc.5 diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile index 4791844847..bb2bc868b6 100644 --- a/sbin/fsdb/Makefile +++ b/sbin/fsdb/Makefile @@ -8,8 +8,10 @@ SRCS= fsdb.c fsdbutil.c \ dir.c inode.c memzone.c pass1.c pass1b.c pass2.c pass3.c pass4.c \ pass5.c preen.c setup.c utilities.c ffs_subr.c ffs_tables.c CFLAGS+= -I${.CURDIR}/../fsck -LDADD+= -lprivate_edit -lprivate_ncurses -DPADD+= ${LIBEDIT} ${LIBNCURSES} + +CFLAGS+= ${PRIVATELIB_CFLAGS} +DPADD+= ${LIBEDIT} ${LIBNCURSES} +LDADD+= -lprivate_edit -lprivate_ncurses LDFLAGS+= ${PRIVATELIB_LDFLAGS} .PATH: ${.CURDIR}/../fsck ${.CURDIR}/../../sys/vfs/ufs diff --git a/sbin/vinum/Makefile b/sbin/vinum/Makefile index acac4cb436..f41c287299 100644 --- a/sbin/vinum/Makefile +++ b/sbin/vinum/Makefile @@ -5,11 +5,14 @@ SRCS= v.c list.c vinumparser.c vinumutil.c vext.h commands.c MAN= vinum.8 WARNS?= 2 -CFLAGS+= -I${.CURDIR}/../../lib/libedit -I${.CURDIR}/../../sys -DPADD= ${LIBEDIT} ${LIBNCURSES} ${LIBDEVSTAT} -LDADD= -lprivate_edit -lprivate_ncurses -ldevstat +# for +CFLAGS+= -I${.CURDIR}/../../sys +DPADD= ${LIBDEVSTAT} +LDADD= -ldevstat -CFLAGS+= -I${_SHLIBDIRPREFIX}/usr/include/priv +CFLAGS+= ${PRIVATELIB_CFLAGS} +DPADD+= ${LIBEDIT} ${LIBNCURSES} +LDADD+= -lprivate_edit -lprivate_ncurses LDFLAGS+= ${PRIVATELIB_LDFLAGS} .include diff --git a/usr.bin/bc/Makefile b/usr.bin/bc/Makefile index 8f1652fa93..ece3c806b8 100644 --- a/usr.bin/bc/Makefile +++ b/usr.bin/bc/Makefile @@ -5,6 +5,7 @@ SRCS= bc.y scan.l tty.c y.tab.h CFLAGS+= -I. -I${.CURDIR} WARNS?= 3 +CFLAGS+= ${PRIVATELIB_CFLAGS} DPADD= ${LIBEDIT} ${LIBNCURSES} LDADD= -lprivate_edit -lprivate_ncurses LDFLAGS+= ${PRIVATELIB_LDFLAGS} diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile index 51a919e7ee..a7aed7a870 100644 --- a/usr.bin/ftp/Makefile +++ b/usr.bin/ftp/Makefile @@ -20,13 +20,19 @@ CFLAGS+=-I${.CURDIR} -I${.OBJDIR} -I${CONTRIBDIR} \ # Avoid symbol conflict with ncurses(lib_trace.c:void trace(unsigned)) CFLAGS+=-Dtrace=ftp_trace -LDADD= -lprivate_edit -lprivate_ncurses -lutil -DPADD= ${LIBEDIT} ${LIBNCURSES} ${LIBUTIL} +LDADD= -lutil +DPADD= ${LIBUTIL} +# for CFLAGS+= -I${_SHLIBDIRPREFIX}/usr/include/priv/ncurses + +LDADD+= -lprivate_edit -lprivate_ncurses +DPADD+= ${LIBEDIT} ${LIBNCURSES} + +CFLAGS+= ${PRIVATELIB_CFLAGS} LDFLAGS+= ${PRIVATELIB_LDFLAGS} -CFLAGS+= -DWITH_SSL -I${.CURDIR}/../../crypto/libressl/include +CFLAGS+= -DWITH_SSL LDADD+= -lprivate_ssl -lprivate_crypto DPADD+= ${LIBSSL} ${LIBCRYPTO} diff --git a/usr.bin/sftp/Makefile b/usr.bin/sftp/Makefile index 9dc0ac3752..008b9adb94 100644 --- a/usr.bin/sftp/Makefile +++ b/usr.bin/sftp/Makefile @@ -7,10 +7,14 @@ SRCS+= progressmeter.c sftp-client.c sftp-common.c sftp-glob.c WARNS?= 3 CFLAGS+= -I${.CURDIR}/../../lib/libssh -I${.CURDIR}/../../crypto/openssh -CFLAGS+= -I${.CURDIR}/../../crypto/libressl/include -DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBEDIT} ${LIBNCURSES} -LDADD= -lprivate_ssh -lprivate_crypto -lutil -lz -lprivate_edit -lprivate_ncurses -LDFLAGS+= -rpath /usr/lib/priv ${PRIVATELIB_LDFLAGS} +DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} +LDADD= -lprivate_ssh -lprivate_crypto -lutil -lz + +CFLAGS+= ${PRIVATELIB_CFLAGS} +LDFLAGS+= ${PRIVATELIB_LDFLAGS} + +DPADD+= ${LIBEDIT} ${LIBNCURSES} +LDADD+= -lprivate_edit -lprivate_ncurses .include diff --git a/usr.bin/tftp/Makefile b/usr.bin/tftp/Makefile index a4a712577c..500ac8ec51 100644 --- a/usr.bin/tftp/Makefile +++ b/usr.bin/tftp/Makefile @@ -2,9 +2,12 @@ PROG= tftp SRCS= main.c tftp.c tftpsubs.c -DPADD= ${LIBEDIT} ${LIBNCURSES} -LDADD= -lprivate_edit -lprivate_ncurses -LDFLAGS+= ${PRIVATELIB_LDFLAGS} + NO_WARRAY_BOUNDS= +CFLAGS+= ${PRIVATELIB_CFLAGS} +DPADD+= ${LIBEDIT} ${LIBNCURSES} +LDADD+= -lprivate_edit -lprivate_ncurses +LDFLAGS+= ${PRIVATELIB_LDFLAGS} + .include diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile index 348f1ee677..d014b7b692 100644 --- a/usr.bin/units/Makefile +++ b/usr.bin/units/Makefile @@ -6,8 +6,9 @@ FILES= units.lib FILESDIR= ${SHAREDIR}/misc .endif -LDADD+= -lprivate_edit -lprivate_ncurses -DPADD+= ${LIBEDIT} ${LIBNCURSES} +CFLAGS+= ${PRIVATELIB_CFLAGS} +DPADD+= ${LIBEDIT} ${LIBNCURSES} +LDADD+= -lprivate_edit -lprivate_ncurses LDFLAGS+= ${PRIVATELIB_LDFLAGS} .include diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile index b0697ba124..28f5441c52 100644 --- a/usr.sbin/cdcontrol/Makefile +++ b/usr.sbin/cdcontrol/Makefile @@ -2,8 +2,9 @@ PROG= cdcontrol -DPADD= ${LIBEDIT} ${LIBNCURSES} -LDADD= -lprivate_edit -lprivate_ncurses +CFLAGS+= ${PRIVATELIB_CFLAGS} +DPADD+= ${LIBEDIT} ${LIBNCURSES} +LDADD+= -lprivate_edit -lprivate_ncurses LDFLAGS+= ${PRIVATELIB_LDFLAGS} .include diff --git a/usr.sbin/lpr/Makefile.inc b/usr.sbin/lpr/Makefile.inc index 034f0a5b3f..db55299135 100644 --- a/usr.sbin/lpr/Makefile.inc +++ b/usr.sbin/lpr/Makefile.inc @@ -1,5 +1,4 @@ # $FreeBSD: src/usr.sbin/lpr/Makefile.inc,v 1.5.2.2 2002/02/01 01:03:39 gad Exp $ -# $DragonFly: src/usr.sbin/lpr/Makefile.inc,v 1.3 2008/10/29 18:18:04 swildner Exp $ CFLAGS+= -DINET6 WARNS?= 2 diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile index cec1e2d74d..9f9dd3329a 100644 --- a/usr.sbin/lpr/lpc/Makefile +++ b/usr.sbin/lpr/lpc/Makefile @@ -5,14 +5,18 @@ PROG= lpc MAN= lpc.8 -SRCS= lpc.c cmds.c cmdtab.c movejobs.c +SRCS= lpc.c cmds.c cmdtab.c movejobs.c BINGRP= daemon BINMODE= 2555 CFLAGS+= -I${.CURDIR}/../common_source -DPADD= ${LIBLPR} ${LIBEDIT} ${LIBNCURSES} -LDADD= ${LIBLPR} -lprivate_edit -lprivate_ncurses +DPADD= ${LIBLPR} +LDADD= ${LIBLPR} + +CFLAGS+= ${PRIVATELIB_CFLAGS} +DPADD+= ${LIBEDIT} ${LIBNCURSES} +LDADD+= -lprivate_edit -lprivate_ncurses LDFLAGS+= ${PRIVATELIB_LDFLAGS} .include diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile index 6114be103f..bd29760654 100644 --- a/usr.sbin/pppctl/Makefile +++ b/usr.sbin/pppctl/Makefile @@ -3,8 +3,10 @@ PROG= pppctl MAN= pppctl.8 WARNS?= 2 -LDADD+= -lprivate_edit -lprivate_ncurses -DPADD+= ${LIBEDIT} ${LIBNCURSES} + +CFLAGS+= ${PRIVATELIB_CFLAGS} +DPADD+= ${LIBEDIT} ${LIBNCURSES} +LDADD+= -lprivate_edit -lprivate_ncurses LDFLAGS+= ${PRIVATELIB_LDFLAGS} .include