[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 0/2] Fix 0.9.7 for mingw



I'm proposing two options to fix the build failure mentioned here:
https://www.redhat.com/archives/libvir-list/2011-November/msg00309.html
without having to cut a release of 0.9.8.

Note that this email is presenting a diff of a diff - that is,
patch 2/2 is a diff that creates two new files, whose contents are
then diffs themselves; it is those resulting diffs that get used in
two contexts - the gnulib local diffs when building libvirt.git, and
the application of those diffs to the non-version-controlled
libvirt-0.9.7/gnulib/lib files when backporting the changes for
building a mingw rpm.  Hopefully that doesn't confuse you too much.

Option 1: Upstream applies both of these patches, then the fix for
building the mingw32-libvirt RPM would be to take the resulting diff
files in patch 2/2 and apply those directly to the gnulib/lib files
present in the 0.9.7 tarball expansion (no .gnulib submodule updated,
and no gnulib-tool run introduced into the spec file).  Later, when
upstream gnulib is fixed, we revert patch 2/2 at the same time we
update our .gnulib submodule.

Option 2 would be to apply patch 1/2, but then wait until the fixes
in patch 2/2 are present in upstream gnulib, and just update
.gnulib directly instead of bothering with local diffs.

Personally, I prefer option 1.  I've tested this by running
./autobuild.sh, which builds both Linux and cross-builds to mingw,
validating that the diffs apply correctly so that mingw builds.

Eric Blake (2):
  build: allow for local gnulib diffs
  build: fix mingw build of gnulib openpty

 autogen.sh                      |    3 +++
 bootstrap.conf                  |    6 ++++--
 cfg.mk                          |    1 +
 gnulib/local/lib/openpty.c.diff |   26 ++++++++++++++++++++++++++
 gnulib/local/lib/pty.in.h.diff  |   13 +++++++++++++
 5 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 gnulib/local/lib/openpty.c.diff
 create mode 100644 gnulib/local/lib/pty.in.h.diff

-- 
1.7.4.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]