cyrus-sasl: fix compile bug, so that we do not need this ugly workaround introduced...

git-svn-id: svn://svn.openwrt.org/openwrt/packages@26575 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/cyrus-sasl/Makefile b/libs/cyrus-sasl/Makefile
index 2aa86f1..980cc75 100644 (file)
--- 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 \
@@ -79,9 +80,6 @@ define Build/Compile
                makemd5
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install || \
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 

diff --git a/libs/cyrus-sasl/patches/100-fix-compile.patch b/libs/cyrus-sasl/patches/100-fix-compile.patch
new file mode 100644 (file)
index 0000000..eaefcd1
--- /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) .