Merge branch 'master' of git+ssh://openadk.org/git/openadk

mk/build.mk

@@ -172,6 +172,7 @@ ${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}:
 		${STAGING_HOST_DIR}/{bin,lib,usr/bin,usr/lib,usr/include}
 	for i in lib64 lib32 libx32;do \
 		cd ${STAGING_TARGET_DIR}/; ln -sf lib $$i; \
+		cd ${STAGING_TARGET_DIR}/usr; ln -sf lib $$i; \
 	done
 
 ${STAGING_TARGET_DIR}/etc/ipkg.conf: ${STAGING_TARGET_DIR}/etc

package/binutils/Makefile

@@ -39,8 +39,8 @@ CONFIGURE_ARGS+=	--disable-werror \
 # disable honour cflags stuff
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
-post-build:
-	$(CP) ${WRKBUILD}/libiberty/libiberty.a $(STAGING_TARGET_DIR)/usr/lib
+pre-build:
+	@-rm $(STAGING_TARGET_DIR)/usr/lib/libiberty.a
 
 libbfd-install:
 	${INSTALL_DIR} ${IDIR_LIBBFD}/usr/lib

package/dovecot/Makefile

@@ -4,21 +4,15 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dovecot
-PKG_VERSION:=		2.0.5
+PKG_VERSION:=		2.2.12
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		7168c5bf40fdd38cceb99114547699b8
-PKG_DESCR:=		A minimal and secure imap server
+PKG_MD5SUM:=		25395269fa2e0525e2d144d71d0450eb
+PKG_DESCR:=		minimal and secure imap server
+PKG_BUILDDEP:=		openssl
+PKG_DEPENDS:=		libopenssl
 PKG_SECTION:=		mail
 PKG_URL:=		http://www.dovecot.org/
-PKG_SITES:=		http://www.dovecot.org/releases/2.0/
-
-PKG_CHOICES_DOVECOT:=	WITH_GNUTLS WITH_OPENSSL
-PKGCD_WITH_OPENSSL:=	use OpenSSL for crypto
-PKGCS_WITH_OPENSSL:=	libopenssl
-PKGCB_WITH_OPENSSL:=	openssl
-PKGCD_WITH_GNUTLS:=	use GnuTLS for crypto
-PKGCS_WITH_GNUTLS:=	libgnutls
-PKGCB_WITH_GNUTLS:=	gnutls
+PKG_SITES:=		http://www.dovecot.org/releases/2.2/
 
 include ${TOPDIR}/mk/package.mk
 
@@ -45,16 +39,10 @@ CONFIGURE_ARGS+=	--with-notify=none \
 			--without-gssapi \
 			--without-pam \
 			--with-ioloop=epoll \
-                	--with-moduledir=/usr/lib/dovecot/modules
-
-ifeq (${ADK_PACKAGE_DOVECOT_WITH_GNUTLS},y)
-CONFIGURE_ARGS+=	--with-ssl=gnutls
-endif
-ifeq (${ADK_PACKAGE_DOVECOT_WITH_OPENSSL},y)
-CONFIGURE_ARGS+=	--with-ssl=openssl
-endif
+                	--with-moduledir=/usr/lib/dovecot/modules \
+			--with-ssl=openssl
 
-post-install:
+dovecot-install:
 	${INSTALL_DIR} ${IDIR_DOVECOT}/etc
 	${INSTALL_DIR} ${IDIR_DOVECOT}/usr/sbin
 	${INSTALL_DIR} ${IDIR_DOVECOT}/usr/libexec/dovecot

package/dovecot/patches/patch-ltmain_sh

@@ -1,11 +0,0 @@
---- dovecot-2.0.5.orig/ltmain.sh	2010-05-24 16:48:06.000000000 +0200
-+++ dovecot-2.0.5/ltmain.sh	2011-01-14 22:05:48.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"

package/gcc/Makefile

@@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,GXX,g++,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CPPFLAGS_FOR_BUILD:=	-I$(STAGING_HOST_DIR)/include
+CPPFLAGS_FOR_BUILD:=	-I$(STAGING_HOST_DIR)/usr/include
 CFLAGS_FOR_BUILD:=
 LDFLAGS_FOR_BUILD:=
 TARGET_CPPFLAGS:=