From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: ncurses conflicts between master and core-updates Date: Fri, 06 Jan 2017 14:18:56 +0100 Message-ID: <87vatsnx6n.fsf@gnu.org> References: <20170106051940.GA22423@jasmine> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38500) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPUQO-0001MH-MV for guix-devel@gnu.org; Fri, 06 Jan 2017 08:19:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cPUQJ-0004eO-Py for guix-devel@gnu.org; Fri, 06 Jan 2017 08:19:16 -0500 In-Reply-To: <20170106051940.GA22423@jasmine> (Leo Famulari's message of "Fri, 6 Jan 2017 00:19:40 -0500") 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: Leo Famulari Cc: guix-devel@gnu.org Hello! (Cc: Jan.) Leo Famulari skribis: > 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 =E2=80=98.pc=E2=80=99 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=E2=80=99t hurt MinGW cross-builds to keep the pkg-config cha= nge. > Can you give me advice about how to resolve this, or merge master into > core-updates yourself? There are a few other conflicts, but they are > easy to resolve. Your question was probably for Jan, no? Ludo=E2=80=99.