Package: cdbs
Version: 0.4.91
Severity: normal
Tags: patch
There are two regressions in python-autotools.mk, first appearing in
0.4.90.
This is an example with pywebkitgtk on natty (sorry can't think of any
good examples that'll build on experimental)
First issue, missing quote:
| cd debian/build/2.6 && CFLAGS="-g -O2 -g -O2" CXXFLAGS="-g -O2 -g -O2"
| CPPFLAGS="" LDFLAGS="-Wl,-Bsymbolic-functions" PYTHON=python2.6"
| /tmp/buildd/pywebkitgtk-1.1.8/./configure --build=x86_64-linux-gnu
| --prefix=/usr --includedir="\${prefix}/include"
| --mandir="\${prefix}/share/man" --infodir="\${prefix}/share/info"
| --sysconfdir=/etc --localstatedir=/var
| --libexecdir="\${prefix}/lib/pywebkitgtk" --disable-maintainer-mode
| --disable-dependency-tracking --disable-silent-rules
| /bin/sh: Syntax error: Unterminated quoted string
And, incorrect (it shouldn't be flavoured) DESTDIR:
| GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 /usr/bin/make -C
| debian/build/2.6 install
| DESTDIR=/tmp/buildd/pywebkitgtk-1.1.8/debian/tmp//2.6
Patch attached.
Related Ubuntu Bug: https://launchpad.net/bugs/705426
SR
-- System Information:
Debian Release: 6.0
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff --git a/1/class/python-autotools.mk.in b/1/class/python-autotools.mk.in
index a6249ae..6446864 100644
--- a/1/class/python-autotools.mk.in
+++ b/1/class/python-autotools.mk.in
@@ -39,9 +39,9 @@ CDBS_BUILD_DEPENDS_class_python-autotools_python ?= $(cdbs_python_builddeps)
CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_python-autotools_python)
# FIXME: Restructure to allow early override
-DEB_CONFIGURE_SCRIPT_ENV += PYTHON=$(or $(python$(cdbs_python$(cdbs_curpythonstem)_nondefault_version):%=python%),$(call cdbs_python_binary,python$(if $(cdbs_make_flavors),$(cdbs_make_curflavor))))"
+DEB_CONFIGURE_SCRIPT_ENV += PYTHON="$(or $(python$(cdbs_python$(cdbs_curpythonstem)_nondefault_version):%=python%),$(call cdbs_python_binary,python$(if $(cdbs_make_flavors),$(cdbs_make_curflavor))))"
# Install all flavors on top of each other by default
-DEB_MAKE_DESTDIRSKEL ?= $(cdbs_curdestdir)
+DEB_MAKE_DESTDIRSKEL = $(cdbs_curdestdir)
endif
