[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, experimental, updated. debian/1%1.21.40-1
Hilko Bengen
bengen at debian.org
Sat Jun 1 11:05:19 UTC 2013
The following commit has been merged in the experimental branch:
commit d56c72438cf34a346ce21ffdf7ee858df61b2978
Author: Hilko Bengen <bengen at debian.org>
Date: Thu May 23 20:17:12 2013 +0200
Added various fixes for building Perl and Python bindings
- Correct paths for building, testing Perl shared library
- Build Python3 extensions with PEP-3149-compliant suffix
diff --git a/debian/patches/0006-perl-various-fixes-for-separated-builds.patch b/debian/patches/0006-perl-various-fixes-for-separated-builds.patch
new file mode 100644
index 0000000..6aee0b5
--- /dev/null
+++ b/debian/patches/0006-perl-various-fixes-for-separated-builds.patch
@@ -0,0 +1,86 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Thu, 23 May 2013 19:20:17 +0200
+Subject: perl: various fixes for separated builds
+
+- Make sure that the .pm gets installed to the correct path
+- Override Makefile.PL parameters everywhere
+- Set PERL5LIB correctly for bindtests
+---
+ perl/Makefile.PL.in | 1 +
+ perl/Makefile.am | 24 +++++++++++++++---------
+ run.in | 4 ++--
+ 3 files changed, 18 insertions(+), 11 deletions(-)
+
+diff --git a/perl/Makefile.PL.in b/perl/Makefile.PL.in
+index 4f12bc0..12b56d9 100644
+--- a/perl/Makefile.PL.in
++++ b/perl/Makefile.PL.in
+@@ -28,4 +28,5 @@ WriteMakefile (
+ INC => '-I at abs_top_builddir@/src -I at abs_top_srcdir@/src',
+ TYPEMAPS => [ '@srcdir@/typemap' ],
+ CCFLAGS => $Config{ccflags} . ' -DGUESTFS_PRIVATE=1 @CFLAGS@',
++ PM => {'lib/Sys/Guestfs.pm' => '@abs_builddir@/blib/arch/Sys/Guestfs.pm'},
+ );
+diff --git a/perl/Makefile.am b/perl/Makefile.am
+index 780024f..ad5211f 100644
+--- a/perl/Makefile.am
++++ b/perl/Makefile.am
+@@ -63,15 +63,18 @@ TESTS_ENVIRONMENT = $(top_builddir)/run --test
+
+ INSTALLDIRS = site
+
++MAKEFILE_PL_PARAMS=\
++ INST_ARCHLIB=$(abs_builddir)/blib/arch \
++ INST_SCRIPT=$(abs_builddir)/blib/script \
++ INST_BIN=$(abs_builddir)/blib/bin \
++ INST_LIB=$(abs_builddir)/blib/lib \
++ INST_MAN1DIR=$(abs_builddir)/blib/man1 \
++ INST_MAN3DIR=$(abs_builddir)/blib/man3 \
++ TEST_FILES=$(abs_srcdir)/t/*.t
++
+ all: Makefile-pl src_deps
+ $(MAKE) -C $(srcdir) -f $(abs_builddir)/Makefile-pl \
+- INST_ARCHLIB=$(abs_builddir)/blib/arch \
+- INST_SCRIPT=$(abs_builddir)/blib/script \
+- INST_BIN=$(abs_builddir)/blib/bin \
+- INST_LIB=$(abs_builddir)/blib/lib \
+- INST_MAN1DIR=$(abs_builddir)/blib/man1 \
+- INST_MAN3DIR=$(abs_builddir)/blib/man3 \
+- TEST_FILES=$(abs_srcdir)/t/*.t
++ $(MAKEFILE_PL_PARAMS)
+
+ Makefile-pl: Makefile.PL
+ cd $(srcdir); \
+@@ -83,11 +86,14 @@ Makefile-pl: Makefile.PL
+ #CLEANFILES = Makefile-pl
+
+ clean-local:
+- -$(MAKE) -f Makefile-pl clean
+- rm -f Makefile-pl
++ -$(MAKE) -C $(srcdir) -f $(abs_builddir)/Makefile-pl \
++ $(MAKEFILE_PL_PARAMS) \
++ clean
++ rm -f $(abs_builddir)/Makefile-pl $(abs_builddir)/Makefile-pl.old
+
+ install-data-hook:
+ $(MAKE) -C $(srcdir) -f $(abs_builddir)/Makefile-pl \
++ $(MAKEFILE_PL_PARAMS) \
+ DESTDIR=$(DESTDIR) install
+
+ endif
+diff --git a/run.in b/run.in
+index ebdec65..9866fc7 100755
+--- a/run.in
++++ b/run.in
+@@ -90,9 +90,9 @@ export LD_LIBRARY_PATH
+
+ # For Perl.
+ if [ -z "$PERL5LIB" ]; then
+- PERL5LIB="$s/perl/lib:$b/perl/blib/lib:$b/perl/blib/arch"
++ PERL5LIB="$b/perl/lib:$b/perl/blib/lib:$b/perl/blib/arch"
+ else
+- PERL5LIB="$s/perl/lib:$b/perl/blib/lib:$b/perl/blib/arch:$PERL5LIB"
++ PERL5LIB="$b/perl/lib:$b/perl/blib/lib:$b/perl/blib/arch:$PERL5LIB"
+ fi
+ export PERL5LIB
+
diff --git a/debian/patches/0007-python-Build-extension-with-PEP-3149-compliant-suffi.patch b/debian/patches/0007-python-Build-extension-with-PEP-3149-compliant-suffi.patch
new file mode 100644
index 0000000..1e393bc
--- /dev/null
+++ b/debian/patches/0007-python-Build-extension-with-PEP-3149-compliant-suffi.patch
@@ -0,0 +1,49 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Fri, 24 May 2013 16:01:38 +0200
+Subject: python: Build extension with PEP-3149 compliant suffix if defined.
+
+---
+ configure.ac | 9 +++++++++
+ python/Makefile.am | 2 +-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9a08212..6b6b382 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1158,6 +1158,14 @@ AS_IF([test "x$enable_python" != "xno"],[
+ AC_MSG_RESULT([$PYTHON_INSTALLDIR])
+ fi
+
++ AC_MSG_CHECKING([for Python extension suffix (PEP-3149)])
++ if test -z "$PYTHON_EXT_SUFFIX"; then
++ python_ext_suffix=`$PYTHON -c "import sysconfig; \
++ print (sysconfig.get_config_var('EXT_SUFFIX') or sysconfig.get_config_var('SO'))"`
++ PYTHON_EXT_SUFFIX=$python_ext_suffix
++ fi
++ AC_MSG_RESULT([$PYTHON_EXT_SUFFIX])
++
+ dnl Look for some optional symbols in libpython.
+ old_LIBS="$LIBS"
+
+@@ -1178,6 +1186,7 @@ AS_IF([test "x$enable_python" != "xno"],[
+ AC_SUBST(PYTHON_PREFIX)
+ AC_SUBST(PYTHON_VERSION)
+ AC_SUBST(PYTHON_INSTALLDIR)
++ AC_SUBST(PYTHON_EXT_SUFFIX)
+ ])
+ AM_CONDITIONAL([HAVE_PYTHON],
+ [test "x$PYTHON" != "xno" && test "x$PYTHON_LIBS" != "x" ])
+diff --git a/python/Makefile.am b/python/Makefile.am
+index ecc25d5..d513695 100644
+--- a/python/Makefile.am
++++ b/python/Makefile.am
+@@ -56,7 +56,7 @@ libguestfsmod_la_LIBADD = \
+ $(LIBVIRT_LIBS) \
+ ../gnulib/lib/libgnu.la
+
+-libguestfsmod_la_LDFLAGS = -avoid-version -shared
++libguestfsmod_la_LDFLAGS = -avoid-version -shared -module -shrext $(PYTHON_EXT_SUFFIX)
+
+ TESTS_ENVIRONMENT = $(top_builddir)/run --test
+
diff --git a/debian/patches/series b/debian/patches/series
index d52eb29..c346de6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@
0003-remove-last-trace-of-ntfsprogs.patch
0004-Fix-for-changed-selinux-mountpoint.patch
0005-Disable-test-utimens-test-futimens-gnulib.patch
+0006-perl-various-fixes-for-separated-builds.patch
+0007-python-Build-extension-with-PEP-3149-compliant-suffi.patch
--
Libguestfs Debian packaging
More information about the Pkg-libvirt-commits
mailing list