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

8 files changed, 30 insertions, 48 deletions

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 0dee1aa94..7c0a7f1a7 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		74
+PKG_RELEASE:=		75
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 PKG_BUILDDEP:=		pkgconf-host file-host
@@ -61,7 +61,7 @@ endif
 	    cat ./files/inittab.vga >> $(IDIR_BASE_FILES)/etc/inittab
 	test -z $(ADK_RUNTIME_GETTY_SERIAL) || \
 	    cat ./files/inittab.serial >> $(IDIR_BASE_FILES)/etc/inittab
-	$(SED) 's#@DEVICE@#$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE)#' $(IDIR_BASE_FILES)/etc/inittab
+	$(SED) 's#@DEVICE@#$(ADK_RUNTIME_CONSOLE_SERIAL_DEVICE)#g' $(IDIR_BASE_FILES)/etc/inittab
 	$(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab
 	test -z $(ADK_RUNTIME_HOSTNAME) || \
 	    echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 5734e198d..1a6014607 100644
--- a/package/binutils/Makefile
+++ b/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
diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile
index 624d47672..0fd736e4d 100644
--- a/package/dovecot/Makefile
+++ b/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
diff --git a/package/dovecot/patches/patch-ltmain_sh b/package/dovecot/patches/patch-ltmain_sh
deleted file mode 100644
index 8c7c6bc7d..000000000
--- a/package/dovecot/patches/patch-ltmain_sh
+++ /dev/null
@@ -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"
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index c0c5f749a..76e58d954 100644
--- a/package/gcc/Makefile
+++ b/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:=
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index b160c1d5f..c75f02ea9 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gnutls
-PKG_VERSION:=		3.2.9
+PKG_VERSION:=		3.2.12
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9ae2bfa55d4c12dd6005cfb7014977f9
+PKG_MD5SUM:=		f507365940de8f095e1d867c6f0842f6
 PKG_DESCR:=		GNU TLS library
 PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libgcrypt libtasn1 zlib libnettle libgmp
@@ -45,7 +45,6 @@ ifneq ($(ADK_PACKAGE_LIBGNUTLS_WITH_CRYPTODEV),)
 CONFIGURE_ARGS+= 	--enable-cryptodev
 endif
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_LDFLAGS+=	-pthread
 CONFIGURE_ARGS+=	--disable-rpath \
 			--without-libz-prefix \
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index a6851f3fa..0a98de806 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mplayer
 PKG_VERSION:=		1.1.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		39dd55f30eb5403f219a606e79a6648a
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		multimedia
@@ -34,9 +34,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MPLAYER,mplayer,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_CC:=		${TARGET_COMPILER_PREFIX}gcc
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
-# gcc 4.5 produces internal compiler error with -Os
-#TARGET_CFLAGS:=$(subst Os,O2,$(TARGET_CFLAGS))
 TARGET_CFLAGS+=		-D_POSIX_SOURCE -D_GNU_SOURCE
 
 CONFIG_STYLE:=		minimal
diff --git a/package/python2/Makefile b/package/python2/Makefile
index fe284da9d..b5aac2032 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -5,11 +5,12 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		python2
 PKG_VERSION:=		2.7.5
-PKG_RELEASE:=		11
+PKG_RELEASE:=		12
 PKG_MD5SUM:=		b4f01a1d0ba0b46b05c73b2ac909b1df
 PKG_DESCR:=		Python scripting language (Version 2)
 PKG_SECTION:=		lang
-PKG_BUILDDEP:=		autotool libffi bzip2-host python2-host 
+PKG_BUILDDEP:=		libffi python2-host 
+HOST_BUILDDEP:=		libffi-host bzip2-host autotool
 PKG_DEPENDS:=		libpthread libffi libgcc
 PKG_URL:=		http://www.python.org/
 PKG_SITES:=		http://www.python.org/ftp/python/${PKG_VERSION}/
@@ -96,18 +97,20 @@ CONFIGURE_ARGS:=	--with-threads \
 			--without-cxx-main
 
 HOST_STYLE:=		auto
-HOST_CONFIGURE_ARGS:=	--with-threads \
+HOST_CONFIGURE_ARGS+=	--with-threads \
 			--disable-ipv6 \
 			--disable-shared \
 			--disable-toolbox-glue \
 			--without-cxx-main
 CFLAGS_FOR_BUILD+=	-fPIC
 
-post-extract:
+hostpre-configure:
 	$(CP) $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD)
 	$(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
 	$(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
-	(cd $(WRKBUILD) && patch -p0 <$(WRKBUILD)/patch-Lib_distutils_sysconfig_py)	
+	(cd $(WRKBUILD) && patch -p0 < patch-Lib_distutils_sysconfig_py)	
+	$(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \
+		$(WRKBUILD)/Misc/python-config.in
 
 hostpost-install:
 	$(INSTALL_BIN) ${WRKBUILD}/Parser/pgen \
@@ -119,6 +122,10 @@ hostpost-install:
 		patch -p0 < $(WRKBUILD)/python-config.patch)
 
 pre-configure:
+	$(CP) $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD)
+	$(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
+	$(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
+	(cd $(WRKBUILD) && patch -p0 <$(WRKBUILD)/patch-Lib_distutils_sysconfig_py)	
 	$(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \
 		$(WRKBUILD)/Misc/python-config.in