From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Nov 29 16:50:08 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE3D1106566C for ; Tue, 29 Nov 2011 16:50:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 817F48FC20 for ; Tue, 29 Nov 2011 16:50:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pATGo808016814 for ; Tue, 29 Nov 2011 16:50:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pATGo87v016813; Tue, 29 Nov 2011 16:50:08 GMT (envelope-from gnats) Resent-Date: Tue, 29 Nov 2011 16:50:08 GMT Resent-Message-Id: <201111291650.pATGo87v016813@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Max Khon Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B58FB1065675 for ; Tue, 29 Nov 2011 16:46:23 +0000 (UTC) (envelope-from fjoe@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A14158FC08 for ; Tue, 29 Nov 2011 16:46:23 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pATGkNQT016246 for ; Tue, 29 Nov 2011 16:46:23 GMT (envelope-from fjoe@freefall.freebsd.org) Received: (from fjoe@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pATGkNN1016245; Tue, 29 Nov 2011 16:46:23 GMT (envelope-from fjoe) Message-Id: <201111291646.pATGkNN1016245@freefall.freebsd.org> Date: Tue, 29 Nov 2011 16:46:23 GMT From: Max Khon To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/162948: 10.0 exp-run without libreadline in base system X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Max Khon List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2011 16:50:09 -0000 >Number: 162948 >Category: ports >Synopsis: 10.0 exp-run without libreadline in base system >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Nov 29 16:50:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Max Khon >Release: FreeBSD 8.2-STABLE i386 >Organization: >Environment: System: FreeBSD freefall.freebsd.org 8.2-STABLE FreeBSD 8.2-STABLE #5 r227907: Wed Nov 23 21:55:50 UTC 2011 simon@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386 >Description: I would like to request a 10.0 exp-run without installed libreadline. Patch against head/ is as follows: Index: gnu/usr.bin/gdb/Makefile.inc =================================================================== --- gnu/usr.bin/gdb/Makefile.inc (revision 227900) +++ gnu/usr.bin/gdb/Makefile.inc (working copy) @@ -15,6 +15,7 @@ OBJ_ROOT= ${.OBJDIR}/../.. OBJ_BU= ${OBJ_ROOT}/binutils OBJ_GDB= ${OBJ_ROOT}/gdb +OBJ_RL= ${OBJ_ROOT}/../lib/libreadline/readline # These assignments duplicate much of the functionality of # MACHINE_CPUARCH, but there's no easy way to export make functions... @@ -45,6 +46,7 @@ CFLAGS+= -I${CNTRB_BU}/include CFLAGS+= -I${CNTRB_GDB}/include CFLAGS+= -I${CNTRB_BU}/bfd +CFLAGS+= -I${OBJ_RL}/.. GENSRCS+= nm.h tm.h Index: gnu/usr.bin/gdb/gdb/Makefile =================================================================== --- gnu/usr.bin/gdb/gdb/Makefile (revision 227900) +++ gnu/usr.bin/gdb/gdb/Makefile (working copy) @@ -5,13 +5,13 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ${OBJ_BU}/libiberty/libiberty.a -GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a +GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a ${OBJ_RL}/libreadline.a # libthread_db.so calls back into gdb for the proc services. Make all the # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBTERMCAP} ${LIBGNUREGEX} +LDADD= ${GDBLIBS} ${BULIBS} -lm -ltermcap -lgnuregex .include Index: gnu/usr.bin/gdb/kgdb/Makefile =================================================================== --- gnu/usr.bin/gdb/kgdb/Makefile (revision 227900) +++ gnu/usr.bin/gdb/kgdb/Makefile (working copy) @@ -6,9 +6,9 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ${OBJ_BU}/libiberty/libiberty.a -GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a +GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a ${OBJ_RL}/libreadline.a -DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lkvm -lm -lreadline -ltermcap -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBTERMCAP} ${LIBGNUREGEX} +LDADD= ${GDBLIBS} ${BULIBS} -lkvm -lm -ltermcap -lgnuregex .include Index: gnu/usr.bin/gdb/gdbtui/Makefile =================================================================== --- gnu/usr.bin/gdb/gdbtui/Makefile (revision 227900) +++ gnu/usr.bin/gdb/gdbtui/Makefile (working copy) @@ -6,13 +6,13 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ${OBJ_BU}/libiberty/libiberty.a -GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a +GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a ${OBJ_RL}/libreadline.a # libthread_db.so calls back into gdb for the proc services. Make all the # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBTERMCAP} ${LIBGNUREGEX} +LDADD= ${GDBLIBS} ${BULIBS} -lm -ltermcap -lgnuregex .include Index: gnu/lib/libreadline/history/doc/Makefile =================================================================== --- gnu/lib/libreadline/history/doc/Makefile (revision 227900) +++ gnu/lib/libreadline/history/doc/Makefile (working copy) @@ -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 Index: gnu/lib/libreadline/history/Makefile =================================================================== --- gnu/lib/libreadline/history/Makefile (revision 227900) +++ gnu/lib/libreadline/history/Makefile (working copy) @@ -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 Index: gnu/lib/libreadline/readline/doc/Makefile =================================================================== --- gnu/lib/libreadline/readline/doc/Makefile (revision 227900) +++ gnu/lib/libreadline/readline/doc/Makefile (working copy) @@ -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 Index: gnu/lib/libreadline/readline/Makefile =================================================================== --- gnu/lib/libreadline/readline/Makefile (revision 227900) +++ gnu/lib/libreadline/readline/Makefile (working copy) @@ -1,27 +1,22 @@ # $FreeBSD$ -SUBDIR= doc - LIB= readline -MAN= doc/readline.3 -SHLIBDIR?= /lib - +INTERNALLIB= TILDESRC= tilde.c SRCS= readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \ rltty.c complete.c bind.c isearch.c display.c signals.c \ util.c kill.c undo.c macro.c input.c callback.c terminal.c \ text.c nls.c misc.c compat.c xmalloc.c $(HISTSRC) $(TILDESRC) +CFLAGS+= -I${.OBJDIR}/.. INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \ rlstdc.h rlconf.h rltypedefs.h +.for _h in ${INSTALLED_HEADERS} +CLEANFILES+= ${_h} +DPSRCS+= ${.OBJDIR}/${_h} -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap - -INCSDIR=${INCLUDEDIR}/readline - -.for hdr in ${INSTALLED_HEADERS} -INCS+= ${SRCDIR}/${hdr} +${.OBJDIR}/${_h}: ${_h} + ${INSTALL} ${.ALLSRC} ${.TARGET} .endfor .include Index: gnu/lib/libreadline/Makefile =================================================================== --- gnu/lib/libreadline/Makefile (revision 227900) +++ gnu/lib/libreadline/Makefile (working copy) @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR = history readline +SUBDIR = readline .include >How-To-Repeat: >Fix: >Release-Note: >Audit-Trail: >Unformatted: