From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Nieuwenhuizen Subject: Re: ncurses conflicts between master and core-updates Date: Fri, 06 Jan 2017 21:33:50 +0100 Message-ID: <87inpsx70x.fsf@gnu.org> References: <20170106051940.GA22423@jasmine> <87vatsnx6n.fsf@gnu.org> 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]:51685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPbDI-0008V4-Mm for guix-devel@gnu.org; Fri, 06 Jan 2017 15:34:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cPbDF-0003rH-I6 for guix-devel@gnu.org; Fri, 06 Jan 2017 15:34:12 -0500 In-Reply-To: <87vatsnx6n.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Fri, 06 Jan 2017 14:18:56 +0100") 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: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org Ludovic Court=C3=A8s 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 =E2=80=98.pc=E2=80=99 files.), and on master, it's d230cf61f6= a (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 c= hange. 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 and tested it builds mingw ncurses and mingw guile ./pre-inst-env guix build --keep-failed --target=3Di686-w64-mingw32 ncu= rses ./pre-inst-env guix build --keep-failed --target=3Di686-w64-mingw32 gui= le HTH -- Greetings, Jan --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.nl= =20=20