From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: ncurses conflicts between master and core-updates Date: Fri, 6 Jan 2017 17:22:58 -0500 Message-ID: <20170106222258.GA31514@jasmine> References: <20170106051940.GA22423@jasmine> <87vatsnx6n.fsf@gnu.org> <87inpsx70x.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPcue-0002KI-3G for guix-devel@gnu.org; Fri, 06 Jan 2017 17:23:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cPcua-00021F-Un for guix-devel@gnu.org; Fri, 06 Jan 2017 17:23:04 -0500 Content-Disposition: inline In-Reply-To: <87inpsx70x.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Jan Nieuwenhuizen Cc: guix-devel@gnu.org On Fri, Jan 06, 2017 at 09:33:50PM +0100, Jan Nieuwenhuizen wrote: > Ludovic Courtès writes: > > >> There's a tricky conflict in the ncurses package definition between > >> master and core-updates. > >> > >> On core-updates, there is 57742b35dc026 (gnu: ncurses: Install > >> pkg-config ‘.pc’ files.), and on master, it's d230cf61f6a (gnu: ncurses: > >> support mingw.). > >> > >> The mingw commit added some conditionals relating to mingw, and I'm not > >> sure if the pkg-config change should be applied for mingw builds or not. > > > I think it can’t hurt MinGW cross-builds to keep the pkg-config change. > > Yes. > > > Your question was probably for Jan, no? > > I started doing a manual merge this morning and then forgot. I pushed > a manual merge of both commits to > > f55d1eff65ea -- https://gitlab.com/janneke/guix/tree/master Thanks Jan! I used this resolve the conflict, and I updated the core-updates branch.