On Sun, 27 Jan 2013 20:08:55 +0100, Evgeni Golov wrote: > On Sun, Jan 27, 2013 at 03:29:42PM +0000, Julien Cristau wrote: > > On Sun, Jan 27, 2013 at 15:22:37 +0100, Evgeni Golov wrote: > > > > > ++ TEMP_CFLAGS="$TEMP_CFLAGS -I/usr/include/mysql" > > > > This bit is probably not quite right in general. Not sure what the > > correct way to get the header location is. > > My brain keeps telling me drop that shit and "#include <mysql/mysql.h>".
This bug hasn't seen any activity since over a month; let's get back on track. Some thoughts: - I think fixing this on the packaging side is less invasive than hacking the upstream autofoo stuff. - IMO, Evgeni's original patch in -3.3 matches what has been done for quite a few other packages regarding to multiarch; obviously, the build dependency on libmysqlclient-dev should be versioned. - An alternative would be to use mysql_config, as proposed by Salvatore; patches against -3.2 and -3.3 attached. - Salvatore's patch (with "dpkg-architecture -qDEB_BUILD_MULTIARCH") in configure.in) indeed looks not so elegant; OTOH that's the same as in the already existing debian/patches/02_libav_multiarch.patch, so it's at least consistent. I guess someone needs to decide what we want to have in wheezy :) Cheers, gregor -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: U2: New York
diff -Nru motion-3.2.12/debian/changelog motion-3.2.12/debian/changelog --- motion-3.2.12/debian/changelog 2012-06-06 12:25:16.000000000 +0200 +++ motion-3.2.12/debian/changelog 2013-03-03 15:07:12.000000000 +0100 @@ -1,3 +1,26 @@ +motion (3.2.12-3.4) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Fix "No longer has support for mysql": try a simpler fix than in -3.3: + - revert the build-dependency on dpkg-dev in debian/control and the usage + of DEB_HOST_MULTIARCH in debian/rules + - use mysql_config to find the libddir, and pass it to configure's + --with-mysql-dir in debian/rules + (Closes: #697221) + + -- gregor herrmann <gre...@debian.org> Sun, 03 Mar 2013 14:52:52 +0100 + +motion (3.2.12-3.3) unstable; urgency=low + + * Non-maintainer upload. + * Properly find MySQL in /usr/lib/$(DEB_HOST_MULTIARCH). + + Build-Depend on dpkg-dev >= 1.16 + + Get DEB_HOST_MULTIARCH from dpkg-architecture. + + Pass --with-mysql-dir=/usr/lib/$(DEB_HOST_MULTIARCH) to configure. + Closes: #697221 + + -- Evgeni Golov <evg...@debian.org> Thu, 03 Jan 2013 12:00:38 +0100 + motion (3.2.12-3.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru motion-3.2.12/debian/rules motion-3.2.12/debian/rules --- motion-3.2.12/debian/rules 2012-06-06 12:24:30.000000000 +0200 +++ motion-3.2.12/debian/rules 2013-03-03 15:11:44.000000000 +0100 @@ -8,6 +8,8 @@ CFLAGS = -Wall -g LDFLAGS = -Wl,--as-needed +MYSQLLIBDIR=$(shell mysql_config --variable=pkglibdir) + ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else @@ -32,6 +34,7 @@ --sysconfdir=/etc/motion \ --with-ffmpeg \ --with-mysql \ + --with-mysql-lib=$(MYSQLLIBDIR) \ --with-pgsql \ --without-optimizecpu \ --without-jpeg-mmx
diff -Nru motion-3.2.12/debian/changelog motion-3.2.12/debian/changelog --- motion-3.2.12/debian/changelog 2013-01-05 19:25:43.000000000 +0100 +++ motion-3.2.12/debian/changelog 2013-03-03 15:07:12.000000000 +0100 @@ -1,3 +1,15 @@ +motion (3.2.12-3.4) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Fix "No longer has support for mysql": try a simpler fix than in -3.3: + - revert the build-dependency on dpkg-dev in debian/control and the usage + of DEB_HOST_MULTIARCH in debian/rules + - use mysql_config to find the libddir, and pass it to configure's + --with-mysql-dir in debian/rules + (Closes: #697221) + + -- gregor herrmann <gre...@debian.org> Sun, 03 Mar 2013 14:52:52 +0100 + motion (3.2.12-3.3) unstable; urgency=low * Non-maintainer upload. diff -Nru motion-3.2.12/debian/control motion-3.2.12/debian/control --- motion-3.2.12/debian/control 2013-01-05 19:25:27.000000000 +0100 +++ motion-3.2.12/debian/control 2013-03-03 14:57:40.000000000 +0100 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Juan Angulo Moreno <j...@apuntale.com> HomePage: http://motion.sf.net -Build-Depends: debhelper (>= 6), dpkg-dev (>= 1.16), dh-autoreconf, libjpeg-dev, zlib1g-dev, libavcodec-dev, libavformat-dev, libpq-dev, libmysqlclient-dev, libv4l-dev +Build-Depends: debhelper (>= 6), dh-autoreconf, libjpeg-dev, zlib1g-dev, libavcodec-dev, libavformat-dev, libpq-dev, libmysqlclient-dev, libv4l-dev Standards-Version: 3.9.2 Package: motion diff -Nru motion-3.2.12/debian/rules motion-3.2.12/debian/rules --- motion-3.2.12/debian/rules 2013-01-05 19:25:27.000000000 +0100 +++ motion-3.2.12/debian/rules 2013-03-03 15:11:44.000000000 +0100 @@ -3,11 +3,13 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + CFLAGS = -Wall -g LDFLAGS = -Wl,--as-needed +MYSQLLIBDIR=$(shell mysql_config --variable=pkglibdir) + ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else @@ -32,7 +34,7 @@ --sysconfdir=/etc/motion \ --with-ffmpeg \ --with-mysql \ - --with-mysql-lib=/usr/lib/$(DEB_HOST_MULTIARCH) \ + --with-mysql-lib=$(MYSQLLIBDIR) \ --with-pgsql \ --without-optimizecpu \ --without-jpeg-mmx
signature.asc
Description: Digital signature
