From: Leo Famulari <leo@famulari.name>
To: guix-devel@gnu.org
Subject: ncurses conflicts between master and core-updates
Date: Fri, 6 Jan 2017 00:19:40 -0500 [thread overview]
Message-ID: <20170106051940.GA22423@jasmine> (raw)
[-- Attachment #1: Type: text/plain, Size: 569 bytes --]
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.
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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next reply other threads:[~2017-01-06 5:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-06 5:19 Leo Famulari [this message]
2017-01-06 13:18 ` ncurses conflicts between master and core-updates Ludovic Courtès
2017-01-06 20:33 ` Jan Nieuwenhuizen
2017-01-06 22:22 ` Leo Famulari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170106051940.GA22423@jasmine \
--to=leo@famulari.name \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.