From 8f0ca903057cd50e6b8dbb429e9b15d0650fd89b Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 10 Apr 2011 11:45:15 +0000
Subject: [PATCH] cyrus-sasl: fix compile bug, so that we do not need this ugly
 workaround introduced in r26541.

SVN-Revision: 26575
---
 libs/cyrus-sasl/Makefile                      |  6 ++----
 libs/cyrus-sasl/patches/100-fix-compile.patch | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 libs/cyrus-sasl/patches/100-fix-compile.patch

diff --git a/libs/cyrus-sasl/Makefile b/libs/cyrus-sasl/Makefile
index 2aa86f143..980cc75f8 100644
--- a/libs/cyrus-sasl/Makefile
+++ b/libs/cyrus-sasl/Makefile
@@ -68,7 +68,8 @@ CONFIGURE_ARGS += \
 	--without-sqlite \
 	--without-rc4 \
 	--without-dmalloc \
-	--without-sfio
+	--without-sfio \
+	--disable-sample
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/include \
@@ -77,9 +78,6 @@ define Build/Compile
 		CFLAGS="" \
 		CPPFLAGS="" \
 		makemd5
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install || \
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
diff --git a/libs/cyrus-sasl/patches/100-fix-compile.patch b/libs/cyrus-sasl/patches/100-fix-compile.patch
new file mode 100644
index 000000000..eaefcd121
--- /dev/null
+++ b/libs/cyrus-sasl/patches/100-fix-compile.patch
@@ -0,0 +1,19 @@
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -176,6 +176,7 @@ SASL_KRB_LIB = @SASL_KRB_LIB@
+ SASL_MECHS = @SASL_MECHS@
+ SASL_STATIC_LIBS = @SASL_STATIC_LIBS@
+ SASL_STATIC_OBJS = @SASL_STATIC_OBJS@
++SASL_STATIC_SRC = $(patsubst %.o, %.c, $(SASL_STATIC_OBJS))
+ SASL_STATIC_SRCS = @SASL_STATIC_SRCS@
+ SASL_UTIL_HEADERS_EXTRA = @SASL_UTIL_HEADERS_EXTRA@
+ SASL_UTIL_LIBS_EXTRA = @SASL_UTIL_LIBS_EXTRA@
+@@ -646,7 +647,7 @@ libsasl2.a: libsasl2.la $(SASL_STATIC_OB
+ 	rm -f $@
+ 	ln -s .libs/$@ $@
+ 
+-$(SASL_STATIC_OBJS): linksrcs
++$(SASL_STATIC_SRC): linksrcs
+ 
+ linksrcs:
+ 	-ln -s $(SASL_STATIC_SRCS) .
-- 
2.30.2