From owner-freebsd-arch@FreeBSD.ORG Sat Nov 6 15:31:39 2010 Return-Path: Delivered-To: freebsd-arch@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 988C21065694 for ; Sat, 6 Nov 2010 15:31:39 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-ew0-f54.google.com (mail-ew0-f54.google.com [209.85.215.54]) by mx1.freebsd.org (Postfix) with ESMTP id 229B58FC1B for ; Sat, 6 Nov 2010 15:31:38 +0000 (UTC) Received: by ewy28 with SMTP id 28so2315978ewy.13 for ; Sat, 06 Nov 2010 08:31:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:references :date:in-reply-to:message-id:user-agent:mime-version:content-type; bh=Xb7REWXttL9gFrnkm6xftkkAXDMon0k7Mnw/y7IQnSw=; b=nrcKgqr0WveoLPs1BrBhOR7bEPOUgroRKTqbRgMVfgRnT+6EyANo/GOQXe7ycaveo/ esqTdGlFuLOqiNi/wvq3n2Zx0cRVcJaL8qxbGsaJV9ErhqCKDOVCu3OEUDrSFeVWCPYc WQGOIjrM6dWqqhhUGticNWuMrBwBEYzJ1hFy0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=EwjB44Hu0hWf4diSfNcBSXLqGJ93MH2Xep3z7eAmnnrQAPZcwWjoNIf3RjadvlxMoC qnv1z8Bjae/fb40W5UGWgNeL26aUuffcXvUFASgq9B4JhPD4rPsaFlY4OxBbZre6VcGx FrS0bOLaFt1XFV4Qy9uJYuaMiNzJPZ69sxZJc= Received: by 10.14.47.69 with SMTP id s45mr1798837eeb.12.1289055831064; Sat, 06 Nov 2010 08:03:51 -0700 (PDT) Received: from localhost (tor-exit-proxy4-readme.formlessnetworking.net [208.53.142.40]) by mx.google.com with ESMTPS id q58sm2209717eeh.3.2010.11.06.08.03.47 (version=SSLv3 cipher=RC4-MD5); Sat, 06 Nov 2010 08:03:49 -0700 (PDT) From: Anonymous To: gljennjohn@googlemail.com References: <20101106120752.001e92c0@ernst.jennejohn.org> Date: Sat, 06 Nov 2010 18:03:39 +0300 In-Reply-To: <20101106120752.001e92c0@ernst.jennejohn.org> (Gary Jennejohn's message of "Sat, 6 Nov 2010 12:07:52 +0100") Message-ID: <86vd4ao5o4.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain Cc: Baptiste Daroussin , freebsd-arch@freebsd.org Subject: Re: [PATCH] update to the latest libedit version and remove libreadline deps X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Nov 2010 15:31:39 -0000 Gary Jennejohn writes: > On Fri, 5 Nov 2010 16:58:55 +0100 > Baptiste Daroussin wrote: >> I've updated libedit to the latest version available in the netbsd cvs. >> UTF8 support is disabled for now has it seems to be experimental and segfault. >> I also patch and tested all the sources that used to be linked against >> libreadline so that it now uses libedit making libreadline unused (I >> guess, perhaps I have missed some) >> >> beware that there are collision between libreadline and libedit >> (/usr/include/readline/readline.h) is provided by both of them. >> >> You can find the patch against current here: >> http://people.freebsd.org/~bapt/update-libedit.patch >> > > contrib/wpa/wpa_supplicant/wpa_cli.c, lib/libdisk/tst01.c and > sbin/gvinum/gvinum.c include stuff from readline. > > These are all still in SVN. I think all those hunks in the patch removing are unnecessary. On NetBSD history.h is a symlink to readline.h according to libedit/readline/Makefile: INCS= readline.h INCSYMLINKS= readline.h ${INCSDIR}/history.h So, try to replace INCSYMLINKS with INCSLINKS.