[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.14.7-1
Hilko Bengen
bengen at debian.org
Sat Dec 10 22:17:25 UTC 2011
The following commit has been merged in the master branch:
commit 565ae83a5fdb2b00cce1a4aa4944bacb879ca88c
Author: Hilko Bengen <bengen at debian.org>
Date: Sat Dec 10 21:08:03 2011 +0100
Added fixes for building Python3 bindings on squeeze
diff --git a/debian/patches/0012-Fixed-check-for-libpython-squeeze-s-python3.1-does-n.patch b/debian/patches/0012-Fixed-check-for-libpython-squeeze-s-python3.1-does-n.patch
new file mode 100644
index 0000000..fd9424a
--- /dev/null
+++ b/debian/patches/0012-Fixed-check-for-libpython-squeeze-s-python3.1-does-n.patch
@@ -0,0 +1,46 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Fri, 9 Dec 2011 10:39:26 +0100
+Subject: Fixed check for libpython -- squeeze's python3.1 does not have the
+ 'mu' suffix
+
+---
+ configure.ac | 23 ++++++++++++-----------
+ 1 files changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f6f4841..9450c5d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -739,19 +739,20 @@ AS_IF([test "x$enable_python" != "xno"],
+ AC_MSG_RESULT([$PYTHON_INSTALLDIR])
+ fi
+
+- dnl Look for libpython and some optional symbols in it.
++ dnl Look for some optional symbols in libpython.
+ old_LIBS="$LIBS"
+- if test "x$PYTHON_VERSION_MAJOR" = "x3"; then
+- dnl libpython3 is called "libpython3.Xmu.so"
+- LIBPYTHON="python${PYTHON_VERSION}mu"
+- else
+- LIBPYTHON="python$PYTHON_VERSION"
+- fi
+- AC_CHECK_LIB([$LIBPYTHON], [PyList_Size], [],
+- [AC_MSG_FAILURE([$LIBPYTHON is not installed])])
+
+- AC_CHECK_FUNCS([PyCapsule_New \
+- PyString_AsString])
++ PYTHON_BLDLIBRARY=`$PYTHON -c "import distutils.sysconfig; \
++ print (distutils.sysconfig.get_config_var('BLDLIBRARY'))"`
++ AC_CHECK_LIB([c],[PyCapsule_New],
++ [AC_DEFINE([HAVE_PYCAPSULE_NEW],1,
++ [Found PyCapsule_New in libpython])],
++ [],[$PYTHON_BLDLIBRARY])
++ AC_CHECK_LIB([c],[PyString_AsString],
++ [AC_DEFINE([HAVE_PYSTRING_ASSTRING],1,
++ [Found PyString_AsString in libpython])],
++ [],[$PYTHON_BLDLIBRARY])
++
+ LIBS="$old_LIBS"
+ fi
+
+--
diff --git a/debian/patches/0012-autoreconf.patch b/debian/patches/0013-autoreconf.patch
similarity index 77%
rename from debian/patches/0012-autoreconf.patch
rename to debian/patches/0013-autoreconf.patch
index 117bad7..fc9c144 100644
--- a/debian/patches/0012-autoreconf.patch
+++ b/debian/patches/0013-autoreconf.patch
@@ -3,27 +3,28 @@ Date: Sat, 20 Aug 2011 20:43:22 +0200
Subject: autoreconf
---
- Makefile.in | 50 +++++++++++++--------------
- aclocal.m4 | 14 ++++---
+ Makefile.in | 50 +++++++-------
+ aclocal.m4 | 14 ++--
cat/Makefile.in | 2 +-
clone/Makefile.in | 2 +-
- configure | 91 ++++++++++++++++++++++++++++----------------------
+ config.h.in | 4 +-
+ configure | 186 +++++++++++++++++++++++++++++---------------------
daemon/Makefile.in | 4 +-
df/Makefile.in | 2 +-
edit/Makefile.in | 2 +-
fuse/Makefile.in | 2 +-
images/Makefile.in | 2 +-
- java/Makefile.in | 5 ++-
- ocaml/Makefile.in | 19 +++++-----
- perl/Makefile.in | 8 +++-
+ java/Makefile.in | 5 +-
+ ocaml/Makefile.in | 19 +++---
+ perl/Makefile.in | 8 ++-
python/Makefile.in | 3 +-
- resize/Makefile.in | 7 ++--
- sparsify/Makefile.in | 8 ++--
- tools/Makefile.in | 6 ++--
- 17 files changed, 122 insertions(+), 105 deletions(-)
+ resize/Makefile.in | 7 +-
+ sparsify/Makefile.in | 8 +-
+ tools/Makefile.in | 6 +-
+ 18 files changed, 181 insertions(+), 145 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 50650c5..7636ec7 100644
+index 20f6faf..35f226f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,7 +71,6 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
@@ -102,7 +103,7 @@ index 50650c5..7636ec7 100644
erlang/examples csharp resize sparsify tools fuse clone \
po-docs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -1321,12 +1321,12 @@ ACLOCAL_AMFLAGS = -I m4
+@@ -1323,12 +1323,12 @@ ACLOCAL_AMFLAGS = -I m4
# Unconditional because nothing is built yet.
SUBDIRS = gnulib/lib images generator src examples po $(am__append_1) \
@@ -121,7 +122,7 @@ index 50650c5..7636ec7 100644
EXTRA_DIST = \
$(generator_built) \
BUGS HACKING RELEASE-NOTES ROADMAP TODO \
-@@ -1478,8 +1478,6 @@ podwrapper.sh: $(top_builddir)/config.status $(srcdir)/podwrapper.sh.in
+@@ -1480,8 +1480,6 @@ podwrapper.sh: $(top_builddir)/config.status $(srcdir)/podwrapper.sh.in
cd $(top_builddir) && $(SHELL) ./config.status $@
run: $(top_builddir)/config.status $(srcdir)/run.in
cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -185,10 +186,10 @@ index 44c3f1c..01d9587 100644
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff --git a/cat/Makefile.in b/cat/Makefile.in
-index 430142e..4991b14 100644
+index 6bcc62e..9f6c814 100644
--- a/cat/Makefile.in
+++ b/cat/Makefile.in
-@@ -1376,7 +1376,7 @@ TESTS_ENVIRONMENT = \
+@@ -1378,7 +1378,7 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
@@ -198,10 +199,10 @@ index 430142e..4991b14 100644
.SUFFIXES:
diff --git a/clone/Makefile.in b/clone/Makefile.in
-index 8e8974d..9cb8fdc 100644
+index 5c3f5b3..2fcacf4 100644
--- a/clone/Makefile.in
+++ b/clone/Makefile.in
-@@ -1243,7 +1243,7 @@ TESTS_ENVIRONMENT = \
+@@ -1245,7 +1245,7 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
@@ -210,11 +211,28 @@ index 8e8974d..9cb8fdc 100644
all: all-am
.SUFFIXES:
+diff --git a/config.h.in b/config.h.in
+index dae6bce..1e5b162 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -889,10 +889,10 @@
+ /* Define if the POSIX multithreading library has read/write locks. */
+ #undef HAVE_PTHREAD_RWLOCK
+
+-/* Define to 1 if you have the `PyCapsule_New' function. */
++/* Found PyCapsule_New in libpython */
+ #undef HAVE_PYCAPSULE_NEW
+
+-/* Define to 1 if you have the `PyString_AsString' function. */
++/* Found PyString_AsString in libpython */
+ #undef HAVE_PYSTRING_ASSTRING
+
+ /* Define to 1 if you have the `raise' function. */
diff --git a/configure b/configure
-index a9475bb..f687d2d 100755
+index 423a3e7..2b14d8b 100755
--- a/configure
+++ b/configure
-@@ -45141,7 +45141,10 @@ else
+@@ -45148,7 +45148,10 @@ else
enable_install_daemon=no
fi
@@ -226,7 +244,7 @@ index a9475bb..f687d2d 100755
INSTALL_DAEMON_TRUE=
INSTALL_DAEMON_FALSE='#'
else
-@@ -45149,9 +45152,6 @@ else
+@@ -45156,9 +45159,6 @@ else
INSTALL_DAEMON_FALSE=
fi
@@ -236,7 +254,7 @@ index a9475bb..f687d2d 100755
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should build the appliance" >&5
$as_echo_n "checking if we should build the appliance... " >&6; }
-@@ -45173,8 +45173,7 @@ fi
+@@ -45180,8 +45180,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_appliance" >&5
$as_echo "$enable_appliance" >&6; }
@@ -246,7 +264,7 @@ index a9475bb..f687d2d 100755
set dummy febootstrap; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-@@ -45212,12 +45211,8 @@ $as_echo "no" >&6; }
+@@ -45219,12 +45218,8 @@ $as_echo "no" >&6; }
fi
@@ -260,7 +278,7 @@ index a9475bb..f687d2d 100755
$as_echo_n "checking if user requested febootstrap --yum-config option... " >&6; }
# Check whether --with-febootstrap-yum-config was given.
-@@ -45227,26 +45222,32 @@ else
+@@ -45234,26 +45229,32 @@ else
FEBOOTSTRAP_YUM_CONFIG=no
fi
@@ -306,7 +324,7 @@ index a9475bb..f687d2d 100755
# Extract the first word of "rpcgen", so it can be a program name with args.
set dummy rpcgen; ac_word=$2
-@@ -48090,6 +48091,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+@@ -45412,6 +45413,7 @@ fi
@@ -314,7 +332,35 @@ index a9475bb..f687d2d 100755
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-@@ -48218,6 +48220,7 @@ if test -n "$PCRE_CFLAGS"; then
+@@ -45540,6 +45542,7 @@ if test -n "$AUGEAS_CFLAGS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_AUGEAS_CFLAGS=`$PKG_CONFIG --cflags "augeas" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -45556,6 +45559,7 @@ if test -n "$AUGEAS_LIBS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_AUGEAS_LIBS=`$PKG_CONFIG --libs "augeas" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -45575,9 +45579,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- AUGEAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "augeas" 2>&1`
++ AUGEAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "augeas" 2>&1`
+ else
+- AUGEAS_PKG_ERRORS=`$PKG_CONFIG --print-errors "augeas" 2>&1`
++ AUGEAS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "augeas" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$AUGEAS_PKG_ERRORS" >&5
+@@ -48249,6 +48253,7 @@ if test -n "$PCRE_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_PCRE_CFLAGS=`$PKG_CONFIG --cflags "libpcre" 2>/dev/null`
@@ -322,7 +368,7 @@ index a9475bb..f687d2d 100755
else
pkg_failed=yes
fi
-@@ -48234,6 +48237,7 @@ if test -n "$PCRE_LIBS"; then
+@@ -48265,6 +48270,7 @@ if test -n "$PCRE_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_PCRE_LIBS=`$PKG_CONFIG --libs "libpcre" 2>/dev/null`
@@ -330,7 +376,7 @@ index a9475bb..f687d2d 100755
else
pkg_failed=yes
fi
-@@ -48253,9 +48257,9 @@ else
+@@ -48284,9 +48290,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -342,7 +388,7 @@ index a9475bb..f687d2d 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$PCRE_PKG_ERRORS" >&5
-@@ -48270,7 +48274,6 @@ installed software in a non-standard prefix.
+@@ -48301,7 +48307,6 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables PCRE_CFLAGS
and PCRE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -350,7 +396,7 @@ index a9475bb..f687d2d 100755
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -48286,7 +48289,6 @@ See the pkg-config man page for more details.
+@@ -48317,7 +48322,6 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
@@ -358,7 +404,7 @@ index a9475bb..f687d2d 100755
else
PCRE_CFLAGS=$pkg_cv_PCRE_CFLAGS
PCRE_LIBS=$pkg_cv_PCRE_LIBS
-@@ -48365,6 +48367,7 @@ if test -n "$LIBVIRT_CFLAGS"; then
+@@ -48396,6 +48400,7 @@ if test -n "$LIBVIRT_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBVIRT_CFLAGS=`$PKG_CONFIG --cflags "libvirt" 2>/dev/null`
@@ -366,7 +412,7 @@ index a9475bb..f687d2d 100755
else
pkg_failed=yes
fi
-@@ -48381,6 +48384,7 @@ if test -n "$LIBVIRT_LIBS"; then
+@@ -48412,6 +48417,7 @@ if test -n "$LIBVIRT_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBVIRT_LIBS=`$PKG_CONFIG --libs "libvirt" 2>/dev/null`
@@ -374,7 +420,7 @@ index a9475bb..f687d2d 100755
else
pkg_failed=yes
fi
-@@ -48400,9 +48404,9 @@ else
+@@ -48431,9 +48437,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -386,7 +432,7 @@ index a9475bb..f687d2d 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBVIRT_PKG_ERRORS" >&5
-@@ -48450,6 +48454,7 @@ if test -n "$LIBXML2_CFLAGS"; then
+@@ -48481,6 +48487,7 @@ if test -n "$LIBXML2_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
@@ -394,7 +440,7 @@ index a9475bb..f687d2d 100755
else
pkg_failed=yes
fi
-@@ -48466,6 +48471,7 @@ if test -n "$LIBXML2_LIBS"; then
+@@ -48497,6 +48504,7 @@ if test -n "$LIBXML2_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
@@ -402,7 +448,7 @@ index a9475bb..f687d2d 100755
else
pkg_failed=yes
fi
-@@ -48485,9 +48491,9 @@ else
+@@ -48516,9 +48524,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -414,7 +460,7 @@ index a9475bb..f687d2d 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBXML2_PKG_ERRORS" >&5
-@@ -48535,6 +48541,7 @@ if test -n "$LIBCONFIG_CFLAGS"; then
+@@ -48566,6 +48574,7 @@ if test -n "$LIBCONFIG_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBCONFIG_CFLAGS=`$PKG_CONFIG --cflags "libconfig" 2>/dev/null`
@@ -422,7 +468,7 @@ index a9475bb..f687d2d 100755
else
pkg_failed=yes
fi
-@@ -48551,6 +48558,7 @@ if test -n "$LIBCONFIG_LIBS"; then
+@@ -48582,6 +48591,7 @@ if test -n "$LIBCONFIG_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBCONFIG_LIBS=`$PKG_CONFIG --libs "libconfig" 2>/dev/null`
@@ -430,7 +476,7 @@ index a9475bb..f687d2d 100755
else
pkg_failed=yes
fi
-@@ -48570,9 +48578,9 @@ else
+@@ -48601,9 +48611,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -442,7 +488,7 @@ index a9475bb..f687d2d 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBCONFIG_PKG_ERRORS" >&5
-@@ -48620,6 +48628,7 @@ if test -n "$HIVEX_CFLAGS"; then
+@@ -48651,6 +48661,7 @@ if test -n "$HIVEX_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_HIVEX_CFLAGS=`$PKG_CONFIG --cflags "hivex" 2>/dev/null`
@@ -450,7 +496,7 @@ index a9475bb..f687d2d 100755
else
pkg_failed=yes
fi
-@@ -48636,6 +48645,7 @@ if test -n "$HIVEX_LIBS"; then
+@@ -48667,6 +48678,7 @@ if test -n "$HIVEX_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_HIVEX_LIBS=`$PKG_CONFIG --libs "hivex" 2>/dev/null`
@@ -458,7 +504,7 @@ index a9475bb..f687d2d 100755
else
pkg_failed=yes
fi
-@@ -48655,9 +48665,9 @@ else
+@@ -48686,9 +48698,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -470,7 +516,7 @@ index a9475bb..f687d2d 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$HIVEX_PKG_ERRORS" >&5
-@@ -48713,6 +48723,7 @@ if test -n "$FUSE_CFLAGS"; then
+@@ -48744,6 +48756,7 @@ if test -n "$FUSE_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_FUSE_CFLAGS=`$PKG_CONFIG --cflags "fuse" 2>/dev/null`
@@ -478,7 +524,7 @@ index a9475bb..f687d2d 100755
else
pkg_failed=yes
fi
-@@ -48729,6 +48740,7 @@ if test -n "$FUSE_LIBS"; then
+@@ -48760,6 +48773,7 @@ if test -n "$FUSE_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_FUSE_LIBS=`$PKG_CONFIG --libs "fuse" 2>/dev/null`
@@ -486,7 +532,7 @@ index a9475bb..f687d2d 100755
else
pkg_failed=yes
fi
-@@ -48748,9 +48760,9 @@ else
+@@ -48779,9 +48793,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -498,7 +544,135 @@ index a9475bb..f687d2d 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$FUSE_PKG_ERRORS" >&5
-@@ -51132,7 +51144,7 @@ ac_config_files="$ac_config_files podwrapper.sh"
+@@ -50019,19 +50033,16 @@ $as_echo "$PYTHON_INSTALLDIR" >&6; }
+ fi
+
+ old_LIBS="$LIBS"
+- if test "x$PYTHON_VERSION_MAJOR" = "x3"; then
+- LIBPYTHON="python${PYTHON_VERSION}mu"
+- else
+- LIBPYTHON="python$PYTHON_VERSION"
+- fi
+- as_ac_Lib=`$as_echo "ac_cv_lib_$LIBPYTHON''_PyList_Size" | $as_tr_sh`
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PyList_Size in -l$LIBPYTHON" >&5
+-$as_echo_n "checking for PyList_Size in -l$LIBPYTHON... " >&6; }
+-if eval \${$as_ac_Lib+:} false; then :
++
++ PYTHON_BLDLIBRARY=`$PYTHON -c "import distutils.sysconfig; \
++ print (distutils.sysconfig.get_config_var('BLDLIBRARY'))"`
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PyCapsule_New in -lc" >&5
++$as_echo_n "checking for PyCapsule_New in -lc... " >&6; }
++if ${ac_cv_lib_c_PyCapsule_New+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-l$LIBPYTHON $LIBS"
++LIBS="-lc $PYTHON_BLDLIBRARY $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -50041,54 +50052,74 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char PyList_Size ();
++char PyCapsule_New ();
+ int
+ main ()
+ {
+-return PyList_Size ();
++return PyCapsule_New ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- eval "$as_ac_Lib=yes"
++ ac_cv_lib_c_PyCapsule_New=yes
+ else
+- eval "$as_ac_Lib=no"
++ ac_cv_lib_c_PyCapsule_New=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-eval ac_res=\$$as_ac_Lib
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_LIB$LIBPYTHON" | $as_tr_cpp` 1
+-_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_PyCapsule_New" >&5
++$as_echo "$ac_cv_lib_c_PyCapsule_New" >&6; }
++if test "x$ac_cv_lib_c_PyCapsule_New" = xyes; then :
+
+- LIBS="-l$LIBPYTHON $LIBS"
++$as_echo "#define HAVE_PYCAPSULE_NEW 1" >>confdefs.h
+
+-else
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "$LIBPYTHON is not installed
+-See \`config.log' for more details" "$LINENO" 5; }
+ fi
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PyString_AsString in -lc" >&5
++$as_echo_n "checking for PyString_AsString in -lc... " >&6; }
++if ${ac_cv_lib_c_PyString_AsString+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lc $PYTHON_BLDLIBRARY $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+- for ac_func in PyCapsule_New \
+- PyString_AsString
+-do :
+- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char PyString_AsString ();
++int
++main ()
++{
++return PyString_AsString ();
++ ;
++ return 0;
++}
+ _ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_c_PyString_AsString=yes
++else
++ ac_cv_lib_c_PyString_AsString=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_PyString_AsString" >&5
++$as_echo "$ac_cv_lib_c_PyString_AsString" >&6; }
++if test "x$ac_cv_lib_c_PyString_AsString" = xyes; then :
++
++$as_echo "#define HAVE_PYSTRING_ASSTRING 1" >>confdefs.h
+
+ fi
+-done
++
+
+ LIBS="$old_LIBS"
+ fi
+@@ -51202,7 +51233,7 @@ ac_config_files="$ac_config_files podwrapper.sh"
ac_config_files="$ac_config_files run"
@@ -507,7 +681,7 @@ index a9475bb..f687d2d 100755
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -52346,7 +52358,6 @@ do
+@@ -52416,7 +52447,6 @@ do
"clone/Makefile") CONFIG_FILES="$CONFIG_FILES clone/Makefile" ;;
"csharp/Makefile") CONFIG_FILES="$CONFIG_FILES csharp/Makefile" ;;
"daemon/Makefile") CONFIG_FILES="$CONFIG_FILES daemon/Makefile" ;;
@@ -516,10 +690,10 @@ index a9475bb..f687d2d 100755
"edit/Makefile") CONFIG_FILES="$CONFIG_FILES edit/Makefile" ;;
"erlang/Makefile") CONFIG_FILES="$CONFIG_FILES erlang/Makefile" ;;
diff --git a/daemon/Makefile.in b/daemon/Makefile.in
-index d266f86..c706e01 100644
+index 1729c71..bb3c501 100644
--- a/daemon/Makefile.in
+++ b/daemon/Makefile.in
-@@ -3110,10 +3110,10 @@ $(top_builddir)/daemon/guestfsd: force
+@@ -3112,10 +3112,10 @@ $(top_builddir)/daemon/guestfsd: force
appliance: force
$(MAKE) -C $(top_builddir)/appliance
@@ -533,10 +707,10 @@ index d266f86..c706e01 100644
ln $< $@
$(libsrcdir)/guestfs_protocol.c: force
diff --git a/df/Makefile.in b/df/Makefile.in
-index ad4c23d..d50fea6 100644
+index 5295978..65af300 100644
--- a/df/Makefile.in
+++ b/df/Makefile.in
-@@ -1316,7 +1316,7 @@ TESTS_ENVIRONMENT = \
+@@ -1318,7 +1318,7 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
@@ -546,10 +720,10 @@ index ad4c23d..d50fea6 100644
.SUFFIXES:
diff --git a/edit/Makefile.in b/edit/Makefile.in
-index 8975b9c..d9e157e 100644
+index 2ca79f7..fee9e78 100644
--- a/edit/Makefile.in
+++ b/edit/Makefile.in
-@@ -1305,7 +1305,7 @@ TESTS_ENVIRONMENT = \
+@@ -1307,7 +1307,7 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
@@ -559,10 +733,10 @@ index 8975b9c..d9e157e 100644
.SUFFIXES:
diff --git a/fuse/Makefile.in b/fuse/Makefile.in
-index b2b7a49..73ff645 100644
+index 3653843..c02863b 100644
--- a/fuse/Makefile.in
+++ b/fuse/Makefile.in
-@@ -1312,7 +1312,7 @@ CLEANFILES = stamp-guestmount.pod
+@@ -1314,7 +1314,7 @@ CLEANFILES = stamp-guestmount.pod
@HAVE_FUSE_TRUE at noinst_DATA = $(top_builddir)/html/guestmount.1.html
# Tests.
@@ -572,10 +746,10 @@ index b2b7a49..73ff645 100644
@HAVE_FUSE_TRUE@ top_builddir=..
diff --git a/images/Makefile.in b/images/Makefile.in
-index ef0d6c2..dbf4230 100644
+index b056a5d..c66b982 100644
--- a/images/Makefile.in
+++ b/images/Makefile.in
-@@ -1231,7 +1231,7 @@ noinst_DATA = test.iso
+@@ -1233,7 +1233,7 @@ noinst_DATA = test.iso
# This is 'check_DATA' because we don't need it until 'make check'
# time and we need the tools we have built in order to make it.
@@ -585,7 +759,7 @@ index ef0d6c2..dbf4230 100644
test.iso test.sqsh \
100kallzeroes 100kallnewlines 100kallspaces 100krandom 10klines \
diff --git a/java/Makefile.in b/java/Makefile.in
-index 9eeaccf..ca50d61 100644
+index 0437ee7..e8bc684 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -92,6 +92,7 @@ build_triplet = @build@
@@ -596,7 +770,7 @@ index 9eeaccf..ca50d61 100644
subdir = java
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1262,7 +1263,7 @@ htmldir = @htmldir@
+@@ -1264,7 +1265,7 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
@@ -605,7 +779,7 @@ index 9eeaccf..ca50d61 100644
libexecdir = @libexecdir@
lispdir = @lispdir@
localedir = @localedir@
-@@ -1351,7 +1352,7 @@ CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_e
+@@ -1353,7 +1354,7 @@ CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_e
@HAVE_JAVA_TRUE at noinst_SCRIPTS = doc-stamp
# Tests (not comprehensive).
@@ -615,7 +789,7 @@ index 9eeaccf..ca50d61 100644
@HAVE_JAVA_TRUE@ JAVA=$(JAVA) \
@HAVE_JAVA_TRUE@ CLASSPATH=.:t:libguestfs-$(VERSION).jar \
diff --git a/ocaml/Makefile.in b/ocaml/Makefile.in
-index aaeeec9..0000fd6 100644
+index b0aef84..6d86177 100644
--- a/ocaml/Makefile.in
+++ b/ocaml/Makefile.in
@@ -71,7 +71,11 @@ DIST_COMMON = $(srcdir)/.depend $(srcdir)/META.in \
@@ -631,7 +805,7 @@ index aaeeec9..0000fd6 100644
subdir = ocaml
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1216,7 +1220,7 @@ EXTRA_DIST = \
+@@ -1218,7 +1222,7 @@ EXTRA_DIST = \
t/*.ml
CLEANFILES = *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so t/*.cmi \
@@ -640,7 +814,7 @@ index aaeeec9..0000fd6 100644
AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
-I$(top_srcdir)/src -I$(top_builddir)/src \
$(WARN_CFLAGS) $(WERROR_CFLAGS)
-@@ -1236,14 +1240,9 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
+@@ -1238,14 +1242,9 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
@HAVE_OCAML_TRUE@ TMPDIR=$(top_builddir) \
@HAVE_OCAML_TRUE@ $(VG)
@@ -659,7 +833,7 @@ index aaeeec9..0000fd6 100644
all: all-am
diff --git a/perl/Makefile.in b/perl/Makefile.in
-index aede1ca..d0d30fd 100644
+index 95a8f68..6d477fa 100644
--- a/perl/Makefile.in
+++ b/perl/Makefile.in
@@ -68,6 +68,8 @@ build_triplet = @build@
@@ -671,7 +845,7 @@ index aede1ca..d0d30fd 100644
subdir = perl
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1212,7 +1214,8 @@ EXTRA_DIST = \
+@@ -1214,7 +1216,8 @@ EXTRA_DIST = \
t/*.t \
typemap
@@ -681,7 +855,7 @@ index aede1ca..d0d30fd 100644
@HAVE_PERL_TRUE at TESTS_ENVIRONMENT = \
@HAVE_PERL_TRUE@ LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
@HAVE_PERL_TRUE@ LIBGUESTFS_PATH=$(top_builddir)/appliance \
-@@ -1537,12 +1540,13 @@ appliance: force
+@@ -1539,12 +1542,13 @@ appliance: force
@HAVE_PERL_TRUE at test_images:
@HAVE_PERL_TRUE@ $(MAKE) -C $(top_builddir)/images
@@ -697,7 +871,7 @@ index aede1ca..d0d30fd 100644
# No! Otherwise it is deleted before the clean-local rule runs.
diff --git a/python/Makefile.in b/python/Makefile.in
-index 96bf88b..fc59d67 100644
+index 7db00ab..8aa691b 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -70,6 +70,7 @@ build_triplet = @build@
@@ -708,7 +882,7 @@ index 96bf88b..fc59d67 100644
subdir = python
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1285,7 +1286,7 @@ EXTRA_DIST = \
+@@ -1287,7 +1288,7 @@ EXTRA_DIST = \
@HAVE_PYTHON_TRUE@ TMPDIR=$(top_builddir) \
@HAVE_PYTHON_TRUE@ PYTHON=$(PYTHON)
@@ -718,7 +892,7 @@ index 96bf88b..fc59d67 100644
.SUFFIXES:
diff --git a/resize/Makefile.in b/resize/Makefile.in
-index 1a2d9ec..470afe2 100644
+index 069f76e..5a8a828 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -72,6 +72,7 @@ DIST_COMMON = $(srcdir)/.depend $(srcdir)/Makefile.am \
@@ -729,7 +903,7 @@ index 1a2d9ec..470afe2 100644
subdir = resize
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1245,7 +1246,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
+@@ -1247,7 +1248,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
# Note this list must be in dependency order.
@HAVE_OCAML_TRUE at OBJECTS = \
@@ -738,7 +912,7 @@ index 1a2d9ec..470afe2 100644
@HAVE_OCAML_TRUE@ progress_c.o \
@HAVE_OCAML_TRUE@ utils.cmx \
@HAVE_OCAML_TRUE@ progress.cmx \
-@@ -1262,7 +1263,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
+@@ -1264,7 +1265,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
# automake will decide we don't need C support in this file. Really
# we do, so we have to provide it ourselves.
@@ -747,7 +921,7 @@ index 1a2d9ec..470afe2 100644
# Manual pages and HTML files for the website.
@HAVE_OCAML_TRUE at man_MANS = virt-resize.1
-@@ -1277,7 +1278,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
+@@ -1279,7 +1280,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
@HAVE_OCAML_TRUE@ LIBGUESTFS_PATH=$(top_builddir)/appliance \
@HAVE_OCAML_TRUE@ TMPDIR=$(top_builddir)
@@ -757,10 +931,10 @@ index 1a2d9ec..470afe2 100644
.SUFFIXES:
diff --git a/sparsify/Makefile.in b/sparsify/Makefile.in
-index 68b7606..ce84769 100644
+index 422291e..e7fda17 100644
--- a/sparsify/Makefile.in
+++ b/sparsify/Makefile.in
-@@ -1244,7 +1244,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
+@@ -1246,7 +1246,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
# Note this list must be in dependency order.
@HAVE_OCAML_TRUE at OBJECTS = \
@@ -769,7 +943,7 @@ index 68b7606..ce84769 100644
@HAVE_OCAML_TRUE@ progress_c.o \
@HAVE_OCAML_TRUE@ utils.cmx \
@HAVE_OCAML_TRUE@ progress.cmx \
-@@ -1255,13 +1255,13 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
+@@ -1257,13 +1257,13 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
# -I $(top_builddir)/src/.libs is a hack which forces corresponding -L
# option to be passed to gcc, so we don't try linking against an
# installed copy of libguestfs.
@@ -785,7 +959,7 @@ index 68b7606..ce84769 100644
# Manual pages and HTML files for the website.
@HAVE_OCAML_TRUE at man_MANS = virt-sparsify.1
-@@ -1275,7 +1275,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
+@@ -1277,7 +1277,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
@HAVE_OCAML_TRUE@ LIBGUESTFS_PATH=$(top_builddir)/appliance \
@HAVE_OCAML_TRUE@ TMPDIR=$(top_builddir)
@@ -795,10 +969,10 @@ index 68b7606..ce84769 100644
.SUFFIXES:
diff --git a/tools/Makefile.in b/tools/Makefile.in
-index bd24af8..86c47d4 100644
+index 47fd69f..6f5171a 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
-@@ -1255,9 +1255,9 @@ CLEANFILES = test.img
+@@ -1257,9 +1257,9 @@ CLEANFILES = test.img
@HAVE_TOOLS_TRUE@ TMPDIR=$(top_builddir) \
@HAVE_TOOLS_TRUE@ PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch
diff --git a/debian/patches/series b/debian/patches/series
index fa74a7a..8c7ca4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,5 @@
0009-Fix-en-dis-able-install-daemon.patch
0010-Fix-include.patch
0011-Install-Java-bindings-to-jni-subdirectory.patch
-0012-autoreconf.patch
+0012-Fixed-check-for-libpython-squeeze-s-python3.1-does-n.patch
+0013-autoreconf.patch
--
Libguestfs Debian packaging
More information about the Pkg-libvirt-commits
mailing list