Browse Source

fix build for linux-uclibcfoo system

Waldemar Brodkorb 10 years ago
parent
commit
4bf2218941
3 changed files with 15 additions and 10 deletions
  1. 1 4
      mk/build.mk
  2. 3 4
      package/cyrus-sasl/Makefile
  3. 11 2
      package/cyrus-sasl/patches/patch-config_ltconfig

+ 1 - 4
mk/build.mk

@@ -310,7 +310,7 @@ all: menuconfig
 # ---------------------------------------------------------------------------
 
 # force entering the subdir, as dependency checking is done there
-.PHONY: $(CONFIG)/conf $(CONFIG)/mconf $(CONFIG)/gconf
+.PHONY: $(CONFIG)/conf $(CONFIG)/mconf
 
 $(CONFIG)/conf:
 	@$(MAKE) -C $(CONFIG) conf
@@ -318,9 +318,6 @@ $(CONFIG)/conf:
 $(CONFIG)/mconf:
 	@$(MAKE) -C $(CONFIG)
 
-$(CONFIG)/gconf:
-	@$(MAKE) -C $(CONFIG) gconf
-
 defconfig: .menu $(CONFIG)/conf
 	@${BASH} ${TOPDIR}/scripts/update-sys
 	@${BASH} ${TOPDIR}/scripts/update-pkg

+ 3 - 4
package/cyrus-sasl/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cyrus-sasl
 PKG_VERSION:=		2.1.26
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		a7f4e5e559a0e37b3ffc438c9456e425
 PKG_DESCR:=		a general purpose authentication library
 PKG_SECTION:=		libs
@@ -21,10 +21,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_ARGS+=	--enable-staticdlopen \
-			--enable-plain \
-			--enable-anon \
+CONFIGURE_ARGS+=	--enable-plain \
 			--enable-login \
+			--disable-anon \
 			--disable-cram \
 			--disable-digest \
 			--disable-scram \

+ 11 - 2
package/cyrus-sasl/patches/patch-config_ltconfig

@@ -1,5 +1,14 @@
---- cyrus-sasl-2.1.23.orig/config/ltconfig	2003-06-12 02:32:43.000000000 +0200
-+++ cyrus-sasl-2.1.23/config/ltconfig	2011-08-08 10:54:43.509265006 +0200
+--- cyrus-sasl-2.1.26.orig/config/ltconfig	2012-10-12 16:05:48.000000000 +0200
++++ cyrus-sasl-2.1.26/config/ltconfig	2014-03-07 07:46:01.000000000 +0100
+@@ -2024,7 +2024,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
 @@ -2034,16 +2034,7 @@ linux-gnu*)
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no