[Pkg-cyrus-sasl2-commits] [cyrus-sasl2] 03/04: Create libsasl2.pc from Makefile for proper substitions (Closes: #754066)

Ondrej Sury ondrej at moszumanska.debian.org
Thu Jul 31 09:14:28 UTC 2014


This is an automated email from the git hooks/post-receive script.

ondrej pushed a commit to branch master
in repository cyrus-sasl2.

commit 054e57cce7d3256ef784703ac74ef68670562984
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Jul 11 10:57:47 2014 +0200

    Create libsasl2.pc from Makefile for proper substitions (Closes: #754066)
---
 debian/patches/properly-create-libsasl2.pc.patch | 36 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 37 insertions(+)

diff --git a/debian/patches/properly-create-libsasl2.pc.patch b/debian/patches/properly-create-libsasl2.pc.patch
new file mode 100644
index 0000000..bd569b9
--- /dev/null
+++ b/debian/patches/properly-create-libsasl2.pc.patch
@@ -0,0 +1,36 @@
+--- cyrus-sasl2.orig/configure.in
++++ cyrus-sasl2/configure.in
+@@ -1419,7 +1419,6 @@ inline static unsigned int sleep(unsigne
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_OUTPUT(Makefile
+-libsasl2.pc
+ include/Makefile
+ sasldb/Makefile
+ plugins/Makefile
+--- cyrus-sasl2.orig/Makefile.am
++++ cyrus-sasl2/Makefile.am
+@@ -43,6 +43,12 @@ AUTOMAKE_OPTIONS = 1.7
+ #
+ ################################################################
+ 
++do_subst = sed -e 's,[@]LIB_DOOR[@],$(LIB_DOOR),g' \
++	       -e 's,[@]SASL_DL_LIB[@],$(SASL_DL_LIB),g' \
++	       -e 's,[@]LIBS[@],$(LIBS),g' \
++	       -e 's,[@]VERSION[@],$(VERSION),g' \
++	       -e 's,[@]libdir[@],$(libdir),g'
++
+ ACLOCAL_AMFLAGS = -I cmulocal -I config
+ 
+ if SASLAUTHD
+@@ -78,6 +84,10 @@ EXTRA_DIST=config cmulocal win32 mac dlc
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libsasl2.pc
+ 
++libsasl2.pc:	$(srcdir)/libsasl2.pc.in Makefile
++	rm -f $@
++	$(do_subst) < $(srcdir)/libsasl2.pc.in > $@
++
+ dist-hook:
+ 	@find $(distdir) -exec chmod o+w {} ';'
+ 	@find $(distdir) -name CVS -print | xargs -t rm -rf
diff --git a/debian/patches/series b/debian/patches/series
index 34c9138..0915958 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,3 +28,4 @@
 0044_debug_log_typo_fix.patch
 0045_revert_upstream_soname_bump.patch
 0046_fix_void_return.patch
+properly-create-libsasl2.pc.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cyrus-sasl2/cyrus-sasl2.git



More information about the Pkg-cyrus-sasl2-commits mailing list