Date: Wed, 9 Jul 2014 15:52:30 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268461 - in head: . gnu/lib/libreadline gnu/lib/libreadline/history gnu/lib/libreadline/readline gnu/lib/libreadline/readline/doc gnu/usr.bin/gdb gnu/usr.bin/gdb/gdb gnu/usr.bin/gdb/gd... Message-ID: <201407091552.s69FqUon070685@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Jul 9 15:52:30 2014 New Revision: 268461 URL: http://svnweb.freebsd.org/changeset/base/268461 Log: 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. That also allows ports to be able to use a modern version of readline PR: 162948 Reviewed by: emaste Deleted: head/gnu/lib/libreadline/history/ head/gnu/lib/libreadline/readline/doc/ Modified: head/ObsoleteFiles.inc head/UPDATING head/gnu/lib/libreadline/Makefile head/gnu/lib/libreadline/readline/Makefile head/gnu/usr.bin/gdb/Makefile.inc head/gnu/usr.bin/gdb/gdb/Makefile head/gnu/usr.bin/gdb/gdbtui/Makefile head/gnu/usr.bin/gdb/kgdb/Makefile head/share/mk/bsd.libnames.mk head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Wed Jul 9 14:36:03 2014 (r268460) +++ head/ObsoleteFiles.inc Wed Jul 9 15:52:30 2014 (r268461) @@ -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 Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Jul 9 14:36:03 2014 (r268460) +++ head/UPDATING Wed Jul 9 15:52:30 2014 (r268461) @@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 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 Modified: head/gnu/lib/libreadline/Makefile ============================================================================== --- head/gnu/lib/libreadline/Makefile Wed Jul 9 14:36:03 2014 (r268460) +++ head/gnu/lib/libreadline/Makefile Wed Jul 9 15:52:30 2014 (r268461) @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR = history readline +SUBDIR = readline .include <bsd.subdir.mk> Modified: head/gnu/lib/libreadline/readline/Makefile ============================================================================== --- head/gnu/lib/libreadline/readline/Makefile Wed Jul 9 14:36:03 2014 (r268460) +++ head/gnu/lib/libreadline/readline/Makefile Wed Jul 9 15:52:30 2014 (r268461) @@ -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 INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \ rlstdc.h rlconf.h rltypedefs.h -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap - -INCSDIR=${INCLUDEDIR}/readline +CFLAGS+= -I${.OBJDIR}/.. +SRCDIR= ${.CURDIR}/../../../../contrib/libreadline -.for hdr in ${INSTALLED_HEADERS} -INCS+= ${SRCDIR}/${hdr} +.for _h in ${INSTALLED_HEADERS} +CLEANFILES+= ${_h} +DPSRCS+= ${.OBJDIR}/${_h} +${.OBJDIR}/${_h}: ${SRCDIR}/${_h} + ${INSTALL} ${.ALLSRC} ${.TARGET} .endfor +DPADD= ${LIBTERMCAP} +LDADD= -ltermcap + .include <bsd.lib.mk> Modified: head/gnu/usr.bin/gdb/Makefile.inc ============================================================================== --- head/gnu/usr.bin/gdb/Makefile.inc Wed Jul 9 14:36:03 2014 (r268460) +++ head/gnu/usr.bin/gdb/Makefile.inc Wed Jul 9 15:52:30 2014 (r268461) @@ -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 Modified: head/gnu/usr.bin/gdb/gdb/Makefile ============================================================================== --- head/gnu/usr.bin/gdb/gdb/Makefile Wed Jul 9 14:36:03 2014 (r268460) +++ head/gnu/usr.bin/gdb/gdb/Makefile Wed Jul 9 15:52:30 2014 (r268461) @@ -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 Modified: head/gnu/usr.bin/gdb/gdbtui/Makefile ============================================================================== --- head/gnu/usr.bin/gdb/gdbtui/Makefile Wed Jul 9 14:36:03 2014 (r268460) +++ head/gnu/usr.bin/gdb/gdbtui/Makefile Wed Jul 9 15:52:30 2014 (r268461) @@ -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 Modified: head/gnu/usr.bin/gdb/kgdb/Makefile ============================================================================== --- head/gnu/usr.bin/gdb/kgdb/Makefile Wed Jul 9 14:36:03 2014 (r268460) +++ head/gnu/usr.bin/gdb/kgdb/Makefile Wed Jul 9 15:52:30 2014 (r268461) @@ -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) Modified: head/share/mk/bsd.libnames.mk ============================================================================== --- head/share/mk/bsd.libnames.mk Wed Jul 9 14:36:03 2014 (r268460) +++ head/share/mk/bsd.libnames.mk Wed Jul 9 15:52:30 2014 (r268461) @@ -57,7 +57,6 @@ LIBGNUREGEX?= ${DESTDIR}${LIBDIR}/libgnu 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 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Wed Jul 9 14:36:03 2014 (r268460) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Wed Jul 9 15:52:30 2014 (r268461) @@ -1998,7 +1998,6 @@ OLD_FILES+=usr/share/info/history.info.g 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407091552.s69FqUon070685>