Ubuntu
cyrus-sasl2 package

Merge lp:~jelmer/ubuntu/oneiric/cyrus-sasl2/ftbfs-825872 into lp:ubuntu/oneiric/cyrus-sasl2

  1. Oneiric (11.10)
  2. ftbfs-825872
  3. Merge into oneiric
Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: 44
Proposed branch: lp:~jelmer/ubuntu/oneiric/cyrus-sasl2/ftbfs-825872
Merge into: lp:ubuntu/oneiric/cyrus-sasl2
Diff against target: 50 lines (+11/-3)
3 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
debian/rules (+4/-2)
To merge this branch: bzr merge lp:~jelmer/ubuntu/oneiric/cyrus-sasl2/ftbfs-825872
Reviewer Review Type Date Requested Status
Colin Watson Approve
Ubuntu Sponsors Pending
Review via email: mp+71456@code.launchpad.net

Description of the change

Use krb5-config.heimdal to determine the heimdal cflags and linker flags
rather than hardcoding them.

This fixes the build with newer versions of Heimdal, which have a different
library path.

To post a comment you must log in.
lp:~jelmer/ubuntu/oneiric/cyrus-sasl2/ftbfs-825872 updated
45. By Jelmer Vernooij

Remove unnecessary variable assignment.

Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-06-08 08:37:13 +0000
3+++ debian/changelog 2011-08-13 16:09:25 +0000
4@@ -1,3 +1,9 @@
5+cyrus-sasl2 (2.1.24~rc1.dfsg1+cvs2011-05-23-4ubuntu1) oneiric; urgency=low
6+
7+ * Fix FTBFS with newer versions of Heimdal. LP: #825872
8+
9+ -- Jelmer Vernooij <jelmer@debian.org> Sat, 13 Aug 2011 18:00:52 +0200
10+
11 cyrus-sasl2 (2.1.24~rc1.dfsg1+cvs2011-05-23-4) unstable; urgency=low
12
13 * Fix yet another upstream segfault breakage in GSSAPI from CVS
14
15=== modified file 'debian/control'
16--- debian/control 2011-05-27 17:05:30 +0000
17+++ debian/control 2011-08-13 16:09:25 +0000
18@@ -4,7 +4,7 @@
19 Maintainer: Debian Cyrus SASL Team <pkg-cyrus-sasl2-debian-devel@lists.alioth.debian.org>
20 Uploaders: Fabian Fagerholm <fabbe@debian.org>, Roberto C. Sanchez <roberto@connexer.com>, Ondřej Surý <ondrej@debian.org>
21 Standards-Version: 3.9.2
22-Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~), autotools-dev, automake, autoconf, libtool, libdb-dev, libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient-dev | libmysqlclient15-dev (>= 5.0.20), libpq-dev (>= 8.1.3-4), heimdal-multidev, krb5-multidev, libsqlite3-dev, libldap2-dev (>= 2.1.30-8), chrpath, groff-base, debconf (>= 0.5) | debconf-2.0, po-debconf, docbook-to-man, hardening-wrapper
23+Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~), autotools-dev, automake, autoconf, libtool, libdb-dev, libpam0g-dev (>= 0.76-22), libssl-dev (>= 0.9.7e-3), libmysqlclient-dev | libmysqlclient15-dev (>= 5.0.20), libpq-dev (>= 8.1.3-4), heimdal-multidev (>= 1.4.0+git20110124.dfsg.1-2), krb5-multidev, libsqlite3-dev, libldap2-dev (>= 2.1.30-8), chrpath, groff-base, debconf (>= 0.5) | debconf-2.0, po-debconf, docbook-to-man, hardening-wrapper
24 Build-Conflicts: heimdal-dev
25 Vcs-Browser: http://git.debian.org/?p=pkg-cyrus-sasl2/cyrus-sasl2.git
26 Vcs-Git: git://git.debian.org/pkg-cyrus-sasl2/cyrus-sasl2/
27
28=== modified file 'debian/rules'
29--- debian/rules 2011-05-27 17:05:30 +0000
30+++ debian/rules 2011-08-13 16:09:25 +0000
31@@ -85,6 +85,8 @@
32 # Some convenience variables
33 export TMPBUILD_MIT := $(CURDIR)/build-mit
34 export TMPBUILD_HEIMDAL := $(CURDIR)/build-heimdal
35+export HEIMDAL_LDFLAGS := $(shell krb5-config.heimdal --libs gssapi | sed -e 's/ -l.*//')
36+export HEIMDAL_CPPFLAGS := $(shell krb5-config.heimdal --cflags gssapi)
37 export TMPPKG_MIT := $(CURDIR)/debian/tmp-mit
38 export TMPPKG_HEIMDAL := $(CURDIR)/debian/tmp-heimdal
39
40@@ -143,8 +145,8 @@
41 CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -I/usr/include/mit-krb5" \
42 dh_auto_configure -B$(TMPBUILD_MIT) -- $(CONFIGURE_COMMON_OPTIONS) --with-gss_impl=mit
43
44- LDFLAGS="$(LDFLAGS) -L/usr/lib/heimdal -Wl,-z,defs" \
45- CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -I/usr/include/heimdal" \
46+ LDFLAGS="$(LDFLAGS) $(HEIMDAL_LDFLAGS) -Wl,-z,defs" \
47+ CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) $(HEIMDAL_CPPFLAGS)" \
48 dh_auto_configure -B$(TMPBUILD_HEIMDAL) -- $(CONFIGURE_COMMON_OPTIONS) --with-gss_impl=heimdal
49
50 # Record the build-time settings for later reference

Subscribers

People subscribed via source and target branches