upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

The GNU readline library is now an INTERNALLIB - that is, it is

Browse source 
statically linked into consumers (GDB and variants) in the base
system, and the shared library is no longer installed.

That also allows ports to be able to use a modern version of readline

PR:		162948
Reviewed by:	emaste
This commit is contained in:
Baptiste Daroussin 2014-07-09 15:52:30 +00:00
parent 97f3c4e8a4
commit 8a833bda0a
13 changed files with 45 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ObsoleteFiles.inc
View file

@ -38,6 +38,25 @@
# xargs -n1 | sort | uniq -d;
# done
# 20140705: turn libreadline into an internal lib
OLD_LIBS+=lib/libreadline.so.8
OLD_FILES+=usr/lib/libreadline.a
OLD_FILES+=usr/lib/libreadline_p.a
OLD_FILES+=usr/lib/libreadline.so
OLD_FILES+=usr/lib/libhistory.a
OLD_FILES+=usr/lib/libhistory_p.a
OLD_FILES+=usr/lib/libhistory.so
OLD_LIBS+=usr/lib/libhistory.so.8
OLD_FILES+=usr/include/readline/chardefs.h
OLD_FILES+=usr/include/readline/history.h
OLD_FILES+=usr/include/readline/keymaps.h
OLD_FILES+=usr/include/readline/readline.h
OLD_FILES+=usr/include/readline/rlconf.h
OLD_FILES+=usr/include/readline/rlstdc.h
OLD_FILES+=usr/include/readline/rltypedefs.h
OLD_FILES+=usr/include/readline/rltypedefs.h
OLD_FILES+=usr/share/info/readline.info.gz
OLD_FILES+=usr/share/man/man3/readline.3.gz
# 20140625: csup removal
OLD_FILES+=usr/bin/csup
OLD_FILES+=usr/bin/cpasswd

7
UPDATING
View file

@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
20140708:
The GNU readline library is now an INTERNALLIB - that is, it is
statically linked into consumers (GDB and variants) in the base
system, and the shared library is no longer installed. The
devel/readline port is available for third party software that
requires readline.
20140702:
The Itanium architecture (ia64) has been removed from the list of
known architectures. This is the first step in the removal of the

2
gnu/lib/libreadline/Makefile
View file

@ -1,5 +1,5 @@
# $FreeBSD$
SUBDIR = history readline
SUBDIR = readline
.include <bsd.subdir.mk>

15
gnu/lib/libreadline/history/Makefile
View file

@ -1,15 +0,0 @@
# $FreeBSD$
SUBDIR= doc
LIB= history
MAN= rlhistory.3
SRCS= $(HISTSRC) xmalloc.c
rlhistory.3: doc/history.3
cp -f ${.ALLSRC} ${.TARGET}
CLEANFILES+= rlhistory.3
.include <bsd.lib.mk>

12
gnu/lib/libreadline/history/doc/Makefile
View file

@ -1,12 +0,0 @@
# $FreeBSD$
SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
INFO = history
INFOSECTION= "Programming & development tools."
INFOENTRY_history= "* History: (history). The GNU History library."
history.info: history.texi hstech.texi hsuser.texi version.texi fdl.texi
.include <bsd.info.mk>

22
gnu/lib/libreadline/readline/Makefile
View file

@ -1,10 +1,8 @@
# $FreeBSD$
SUBDIR= doc
LIB= readline
MAN= doc/readline.3
SHLIBDIR?= /lib
INTERNALLIB= yes
NO_MAN= yes
TILDESRC= tilde.c
SRCS= readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
@ -15,13 +13,17 @@ SRCS= readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
rlstdc.h rlconf.h rltypedefs.h
CFLAGS+= -I${.OBJDIR}/..
SRCDIR= ${.CURDIR}/../../../../contrib/libreadline
.for _h in ${INSTALLED_HEADERS}
CLEANFILES+= ${_h}
DPSRCS+= ${.OBJDIR}/${_h}
${.OBJDIR}/${_h}: ${SRCDIR}/${_h}
${INSTALL} ${.ALLSRC} ${.TARGET}
.endfor
DPADD= ${LIBTERMCAP}
LDADD= -ltermcap
INCSDIR=${INCLUDEDIR}/readline
.for hdr in ${INSTALLED_HEADERS}
INCS+= ${SRCDIR}/${hdr}
.endfor
.include <bsd.lib.mk>

20
gnu/lib/libreadline/readline/doc/Makefile
View file

@ -1,20 +0,0 @@
# $FreeBSD$
SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
INFO = readline rluserman
INFOSECTION= "Programming & development tools."
INFOENTRY_readline= "* Readline: (readline). The GNU Readline library"
INFOENTRY_rluserman= "* Readline: (readline). The GNU readline library API"
CLEANFILES += readline.texi
readline.info: rlman.texi rluser.texi rltech.texi version.texi fdl.texi
readline.texi: rlman.texi
cp -f ${SRCDIR}/rlman.texi ${.TARGET}
rluserman.info: rluserman.texi version.texi rluser.texi fdl.texi
.include <bsd.info.mk>

3
gnu/usr.bin/gdb/Makefile.inc
View file

@ -15,6 +15,8 @@ CNTRB_RL= ${CNTRB_ROOT}/libreadline
OBJ_ROOT= ${.OBJDIR}/../..
OBJ_BU= ${OBJ_ROOT}/binutils
OBJ_GDB= ${OBJ_ROOT}/gdb
OBJ_RL= ${OBJ_ROOT}/../lib/libreadline/readline
LIBREADLINE= ${OBJ_ROOT}/../lib/libreadline/readline/libreadline.a
# These assignments duplicate much of the functionality of
# MACHINE_CPUARCH, but there's no easy way to export make functions...
@ -46,6 +48,7 @@ CFLAGS+= -I${CNTRB_GDB}/gdb/config
CFLAGS+= -I${CNTRB_BU}/include
CFLAGS+= -I${CNTRB_GDB}/include
CFLAGS+= -I${CNTRB_BU}/bfd
CFLAGS+= -I${OBJ_RL}/..
GENSRCS+= nm.h tm.h

2
gnu/usr.bin/gdb/gdb/Makefile
View file

@ -12,7 +12,7 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
LDFLAGS+= -Wl,-E
DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex
LDADD= ${GDBLIBS} ${BULIBS} -lm ${LIBREADLINE} -ltermcap -lgnuregex
NO_PIE= yes

2
gnu/usr.bin/gdb/gdbtui/Makefile
View file

@ -13,7 +13,7 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
LDFLAGS+= -Wl,-E
DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex
LDADD= ${GDBLIBS} ${BULIBS} -lm ${LIBREADLINE} -ltermcap -lgnuregex
NO_PIE= yes

2
gnu/usr.bin/gdb/kgdb/Makefile
View file

@ -10,7 +10,7 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} \
${LIBGNUREGEX}
LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm -lreadline -ltermcap \
LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm ${LIBREADLINE} -ltermcap \
-lgnuregex
.if defined(GDB_CROSS_DEBUGGER)

2
share/mk/bsd.libnames.mk
View file

@ -57,7 +57,6 @@ LIBGNUREGEX?= ${DESTDIR}${LIBDIR}/libgnuregex.a
LIBGSSAPI?= ${DESTDIR}${LIBDIR}/libgssapi.a
LIBGSSAPI_KRB5?= ${DESTDIR}${LIBDIR}/libgssapi_krb5.a
LIBHDB?= ${DESTDIR}${LIBDIR}/libhdb.a
LIBHISTORY?= ${DESTDIR}${LIBDIR}/libhistory.a
LIBHEIMBASE?= ${DESTDIR}${LIBDIR}/libheimbase.a
LIBHEIMIPCC?= ${DESTDIR}${LIBPRIVATEDIR}/libheimipcc.a
LIBHEIMIPCS?= ${DESTDIR}${LIBPRIVATEDIR}/libheimipcs.a
@ -127,7 +126,6 @@ LIBPROC?= ${DESTDIR}${LIBDIR}/libproc.a
LIBPROCSTAT?= ${DESTDIR}${LIBDIR}/libprocstat.a
LIBPTHREAD?= ${DESTDIR}${LIBDIR}/libpthread.a
LIBRADIUS?= ${DESTDIR}${LIBDIR}/libradius.a
LIBREADLINE?= ${DESTDIR}${LIBDIR}/libreadline.a
LIBROKEN?= ${DESTDIR}${LIBDIR}/libroken.a
LIBRPCSVC?= ${DESTDIR}${LIBDIR}/librpcsvc.a
LIBRPCSEC_GSS?= ${DESTDIR}${LIBDIR}/librpcsec_gss.a

2
tools/build/mk/OptionalObsoleteFiles.inc
View file

@ -1998,7 +1998,6 @@ OLD_FILES+=usr/share/info/history.info.gz
OLD_FILES+=usr/share/info/info-stnd.info.gz
OLD_FILES+=usr/share/info/info.info.gz
OLD_FILES+=usr/share/info/ld.info.gz
OLD_FILES+=usr/share/info/readline.info.gz
OLD_FILES+=usr/share/info/regex.info.gz
OLD_FILES+=usr/share/info/rluserman.info.gz
OLD_FILES+=usr/share/info/stabs.info.gz
@ -3725,7 +3724,6 @@ OLD_FILES+=usr/lib/libpcap_p.a
OLD_FILES+=usr/lib/libpmc_p.a
OLD_FILES+=usr/lib/libpthread_p.a
OLD_FILES+=usr/lib/libradius_p.a
OLD_FILES+=usr/lib/libreadline_p.a
OLD_FILES+=usr/lib/libroken_p.a
OLD_FILES+=usr/lib/librpcsvc_p.a
OLD_FILES+=usr/lib/librt_p.a