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

mk/vars.mk

@@ -80,11 +80,14 @@ endif
 # target tools
 TARGET_CC:=		${TARGET_COMPILER_PREFIX}gcc
 
-# use a gcc wrapper for coldfire support
+# use a gcc wrapper for coldfire/arm uclinux support
 ifeq ($(ADK_TARGET_UCLINUX),y)
 ifeq ($(ADK_TARGET_ARCH_M68K),y)
 TARGET_CC:=		adk-uclinux-gcc
 endif
+ifeq ($(ADK_TARGET_ARCH_ARM),y)
+TARGET_CC:=		adk-uclinux-gcc
+endif
 endif
 
 TARGET_CXX:=		${TARGET_COMPILER_PREFIX}g++
@@ -105,8 +108,10 @@ TARGET_LDFLAGS:=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \
 			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib
 
 ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
+ifeq ($(ADK_TARGET_BINFMT_FLAT_SEP_DATA),y)
 TARGET_CFLAGS+=		-msep-data
 TARGET_CXXFLAGS+=	-msep-data
+endif
 TARGET_LDFLAGS+=	-elf2flt
 endif
 
@@ -193,8 +198,8 @@ endif
 
 ifeq ($(ADK_TARGET_ARCH_ARM),y)
 ifeq ($(ADK_TARGET_ARCH_ARM_WITH_THUMB),y)
-TARGET_CFLAGS+=		-mthumb
-TARGET_CXXFLAGS+=	-mthumb
+TARGET_CFLAGS+=		-mthumb -Wa,-mimplicit-it=thumb
+TARGET_CXXFLAGS+=	-mthumb -Wa,-mimplicit-it=thumb
 else
 TARGET_CFLAGS+=		-marm
 TARGET_CXXFLAGS+=	-marm

package/.template/Makefile

@@ -15,7 +15,7 @@ PKG_BUILDDEP:=		add packages which need to be compiled
 PKG_URL:=		add project url
 PKG_SITES:=		add download url without package name
 # alternatively use a pre-defined set of mirrors, see mk/mirrors.mk:
-#PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=sub/path/}
+#PKG_SITES:=		$(MASTER_SITE_SOURCEFORGE:=sub/path/)
 
 # if more than one binary package is created, add symbol names of all here
 # leave variable empty, when no binary package is created. You can set it
@@ -53,11 +53,11 @@ PKG_SITES:=		add download url without package name
 #PKGCS_WITH_GNUTLS:=	libgnutls
 
 # if downloaded package is not ending with .tar.xz use following
-#DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+#DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 #CONFIG_STYLE:=		manual
 # use following to add ./configure options
@@ -74,4 +74,4 @@ $(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPE
 		$(IDIR_@UPKG@)/usr/bin
 
 # please remove ALL above comments, before commiting
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/.templatelib/Makefile

@@ -8,21 +8,21 @@ PKG_VERSION:=		@VER@
 PKG_RELEASE:=		1
 PKG_HASH:=		add sha256 checksum of package here
 PKG_DESCR:=		add short description
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/misc
 PKG_URL:=		add project url
 PKG_SITES:=		add download url without package name
 PKG_OPTS:=		dev
 
 # if downloaded package is not ending with .tar.xz use following
-#DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+#DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 @PKG@-install:
 	$(INSTALL_DIR) $(IDIR_@UPKG@)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/@PKG@*.so* \
+	$(CP) $(WRKINST)/usr/lib/lib@PKG@*.so* \
 		$(IDIR_@UPKG@)/usr/lib
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/.templateprog/Makefile

@@ -15,15 +15,15 @@ PKG_URL:=		add project url
 PKG_SITES:=		add download url without package name
 
 # if downloaded package is not ending with .tar.xz use following
-#DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+#DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 @PKG@-install:
 	$(INSTALL_DIR) $(IDIR_@UPKG@)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ \
 		$(IDIR_@UPKG@)/usr/bin
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/bison/Makefile

@@ -1,33 +1,33 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		bison
-PKG_VERSION:=		3.0.2
+PKG_VERSION:=		3.0.4
 PKG_RELEASE:=		1
-PKG_HASH:=		a2c3e8528bdb50567d6fa26deeb493dc5ccd7e277b865251608a9e43ac928f3c
+PKG_HASH:=		a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1
 PKG_DESCR:=		parser generator
 PKG_SECTION:=		dev/tools
 PKG_BUILDDEP:=		m4-host flex-host bison-host
 HOST_BUILDDEP:=		m4-host flex-host
 PKG_URL:=		http://www.gnu.org/software/bison/
-PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
+PKG_SITES:=		$(MASTER_SITE_GNU:=bison/)
 
-include ${ADK_TOPDIR}/mk/host.mk
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call HOST_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call HOST_template,BISON,bison,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,BISON,bison,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 TARGET_LDFLAGS+=	-lrt
 XAKE_FLAGS+=		M4=m4
 
 bison-install:
-	${INSTALL_DIR} ${IDIR_BISON}/usr/bin ${IDIR_BISON}/usr/share/bison
-	${INSTALL_BIN} ${WRKINST}/usr/bin/bison ${IDIR_BISON}/usr/bin
-	${CP} ${WRKINST}/usr/share/bison/* ${IDIR_BISON}/usr/share/bison
-	$(CP) ./files/yacc ${IDIR_BISON}/usr/bin
+	$(INSTALL_DIR) $(IDIR_BISON)/usr/bin $(IDIR_BISON)/usr/share/bison
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/bison $(IDIR_BISON)/usr/bin
+	$(INSTALL_BIN) ./files/yacc $(IDIR_BISON)/usr/bin
+	$(CP) $(WRKINST)/usr/share/bison/* $(IDIR_BISON)/usr/share/bison
 
-include ${ADK_TOPDIR}/mk/host-bottom.mk
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/bison/patches/patch-Makefile_in

@@ -1,27 +0,0 @@
---- bison-3.0.1.orig/Makefile.in	2013-11-12 14:57:09.000000000 +0100
-+++ bison-3.0.1/Makefile.in	2013-11-27 18:46:46.000000000 +0100
-@@ -5134,22 +5134,12 @@ $(CROSS_OPTIONS_TEXI): doc/bison.help $(
- doc/refcard.pdf: doc/refcard.tex
- 	$(AM_V_GEN) cd doc && pdftex $(abs_top_srcdir)/doc/refcard.tex
- $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
--	$(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp
--	$(AM_V_at) src/bison$(EXEEXT) --help   >>doc/bison.help.tmp
-+	echo "3.0.1" >doc/bison.help.tmp
-+	echo "no help"   >>doc/bison.help.tmp
- 	$(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@
- 
- # Depend on configure to get version number changes.
- $(top_srcdir)/doc/bison.1: doc/bison.help doc/bison.x $(top_srcdir)/configure
--	$(AM_V_GEN)$(HELP2MAN)			\
--	    --include=$(top_srcdir)/doc/bison.x	\
--	    --output=$@.t src/bison$(EXEEXT)
--	$(AM_V_at)if $(remove_time_stamp) $@ >$@a.t 2>/dev/null &&	 \
--	   $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then \
--	  touch $@;							 \
--	else								 \
--	  mv $@.t $@;							 \
--	fi
--	$(AM_V_at)rm -f $@*.t
- 
- .gv.eps:
- 	$(AM_V_GEN) $(MKDIR_P) `echo "./$@" | sed -e 's,/[^/]*$$,,'`

package/bison/patches/patch-doc_bison_help

@@ -1,11 +0,0 @@
---- bison-3.0.1.orig/doc/bison.help	2013-11-12 14:57:56.000000000 +0100
-+++ bison-3.0.1/doc/bison.help	2013-11-27 18:41:48.000000000 +0100
-@@ -4,7 +4,7 @@ Written by Robert Corbett and Richard St
- Copyright (C) 2013 Free Software Foundation, Inc.
- This is free software; see the source for copying conditions.  There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--Usage: src/bison [OPTION]... FILE
-+Usage: bison [OPTION]... FILE
- Generate a deterministic LR or generalized LR (GLR) parser employing
- LALR(1), IELR(1), or canonical LR(1) parser tables.  IELR(1) and
- canonical LR(1) support is experimental.

package/curl/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		curl
-PKG_VERSION:=		7.39.0
+PKG_VERSION:=		7.40.0
 PKG_RELEASE:=		1
-PKG_HASH:=		a3a7c2b9e7416c728469eb4cb5b61e9161335df4278329e1d9cc3c194e25d795
+PKG_HASH:=		c2e0705a13e53f8f924d1eaeb2ab94f59a9e162007c489b9ab0c96238bddf84b
 PKG_DESCR:=		client-side url transfer tool
 PKG_SECTION:=		net/http
 PKG_DEPENDS:=		libcurl
@@ -26,7 +26,7 @@ PKGSS_LIBCURL:=		zlib
 PKG_FLAVOURS_CURL:=	WITH_IPV6
 PKGFD_WITH_IPV6:=	enable ipv6 support
 
-PKG_CHOICES_LIBCURL:=	WITHOUT_SSL WITH_GNUTLS WITH_OPENSSL
+PKG_CHOICES_LIBCURL:=	WITHOUT_SSL WITH_GNUTLS WITH_OPENSSL WITH_CYASSL
 PKGCD_WITHOUT_SSL:=	use no ssl
 PKGCD_WITH_OPENSSL:=	use openssl for crypto
 PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates libgmp
@@ -34,6 +34,9 @@ PKGCB_WITH_OPENSSL:=	openssl
 PKGCD_WITH_GNUTLS:=	use gnutls for crypto
 PKGCS_WITH_GNUTLS:=	libgnutls ca-certificates libgmp
 PKGCB_WITH_GNUTLS:=	gnutls
+PKGCD_WITH_CYASSL:=	use cyassl for crypto
+PKGCS_WITH_CYASSL:=	cyassl ca-certificates
+PKGCB_WITH_CYASSL:=	cyassl
 
 include ${ADK_TOPDIR}/mk/package.mk
 
@@ -55,10 +58,15 @@ CONFIGURE_ARGS+=	--with-gnutls="${STAGING_TARGET_DIR}/usr" \
 			--without-ssl \
 			--without-axtls
 endif
+ifeq (${ADK_PACKAGE_LIBCURL_WITH_CYASSL},y)
+CONFIGURE_ARGS+=	--with-cyassl="${STAGING_TARGET_DIR}/usr" \
+			--without-ssl \
+			--without-gnutls \
+			--without-axtls
+endif
 
 CONFIGURE_ENV+=		curl_typeof_curl_socklen_t=socklen_t
-CONFIGURE_ARGS+=	--disable-thread \
-			--enable-cookies \
+CONFIGURE_ARGS+=	--enable-cookies \
 			--enable-crypto-auth \
 			--enable-nonblocking \
 			--enable-file \

package/cyassl/Makefile

@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		cyassl
+PKG_VERSION:=		3.3.0
+PKG_RELEASE:=		1
+PKG_HASH:=		7ce5f704ec4ad72e4b955aeec732ad8a38e8dcd1f93bfc79dfda7c4bc894c67e
+PKG_DESCR:=		portable embedded ssl library
+PKG_SECTION:=		libs/crypto
+PKG_URL:=		http://www.wolfssl.com
+PKG_SITES:=		http://www.openadk.org/distfiles/
+PKG_OPTS:=		dev
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,CYASSL,cyassl,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+
+CONFIGURE_ARGS+=	--disable-examples
+CONFIGURE_ENV+=		C_EXTRA_FLAGS='$(TARGET_CFLAGS)'
+
+cyassl-install:
+	$(INSTALL_DIR) $(IDIR_CYASSL)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libcyassl*.so* \
+		$(IDIR_CYASSL)/usr/lib
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/flex/Makefile

@@ -1,38 +1,36 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		flex
-PKG_VERSION:=		2.5.35
-PKG_RELEASE:=		3
-PKG_HASH:=		a6fe3ac80b5f89769d833efde712f95bb0255bcf9089fa324636a9b8a005c717
+PKG_VERSION:=		2.5.39
+PKG_RELEASE:=		1
+PKG_HASH:=		c988bb3ab340aaba16df5a54ab98bb4760599975375c8ac9388a078b7f27e9e8
 PKG_DESCR:=		fast lexical analyzer
 PKG_SECTION:=		dev/tools
 PKG_BUILDDEP:=		m4-host
 HOST_BUILDDEP:=		m4-host
 PKG_URL:=		http://flex.sourceforge.net/
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
+PKG_SITES:=		$(MASTER_SITE_SOURCEFORGE:=flex/)
 PKG_OPTS:=		dev
 
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
-include ${ADK_TOPDIR}/mk/host.mk
-include ${ADK_TOPDIR}/mk/package.mk
-
-$(eval $(call HOST_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call HOST_template,FLEX,flex,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,FLEX,flex,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 hostpost-install:
 	(cd $(STAGING_HOST_DIR)/usr/bin; ln -sf flex lex)
 
 flex-install:
-	${INSTALL_DIR} ${IDIR_FLEX}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/flex ${IDIR_FLEX}/usr/bin
+	$(INSTALL_DIR) $(IDIR_FLEX)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/flex $(IDIR_FLEX)/usr/bin
 	# workaround for dev subpackage
-	${INSTALL_DIR} ${IDIR_FLEX_DEV}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libfl.a \
-		${IDIR_FLEX_DEV}/usr/lib
+	$(INSTALL_DIR) $(IDIR_FLEX_DEV)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libfl.a \
+		$(IDIR_FLEX_DEV)/usr/lib
 
-include ${ADK_TOPDIR}/mk/host-bottom.mk
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/flex/patches/patch-Makefile_in

@@ -1,10 +0,0 @@
---- flex-2.5.35.orig/Makefile.in	2008-02-26 22:34:10.000000000 +0100
-+++ flex-2.5.35/Makefile.in	2010-10-04 23:21:19.000000000 +0200
-@@ -483,7 +483,6 @@ libfl.a: $(libfl_a_OBJECTS) $(libfl_a_DE
- libfl_pic.a: $(libfl_pic_a_OBJECTS) $(libfl_pic_a_DEPENDENCIES) 
- 	-rm -f libfl_pic.a
- 	$(libfl_pic_a_AR) libfl_pic.a $(libfl_pic_a_OBJECTS) $(libfl_pic_a_LIBADD)
--	$(RANLIB) libfl_pic.a
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"

package/flex/patches/patch-conf_in

@@ -1,20 +0,0 @@
---- flex-2.5.35.orig/conf.in	2008-02-26 22:34:02.000000000 +0100
-+++ flex-2.5.35/conf.in	2010-10-04 23:18:48.000000000 +0200
-@@ -162,7 +162,7 @@
- 
- /* If using the C implementation of alloca, define if you know the
-    direction of stack growth for your system; otherwise it will be
--   automatically deduced at run-time.
-+   automatically deduced at runtime.
- 	STACK_DIRECTION > 0 => grows toward higher addresses
- 	STACK_DIRECTION < 0 => grows toward lower addresses
- 	STACK_DIRECTION = 0 => direction of growth unknown */
-@@ -190,7 +190,7 @@
- /* Define to rpl_realloc if the replacement function should be used. */
- #undef realloc
- 
--/* Define to `unsigned' if <sys/types.h> does not define. */
-+/* Define to `unsigned int' if <sys/types.h> does not define. */
- #undef size_t
- 
- /* Define as `fork' if `vfork' does not work. */

package/gnutls/Makefile

@@ -1,12 +1,12 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		gnutls
-PKG_VERSION:=		3.3.10
+PKG_VERSION:=		3.3.12
 PKG_RELEASE:=		1
-PKG_HASH:=		e27553981d48d9211a7e5e94f6e78c575205202a181c2345a1c8466ebf1d2219
+PKG_HASH:=		67ab3e92c5d48f3323b897d7c1aa0bb2af6f3a84f5bd9931cda163a7ff32299b
 PKG_DESCR:=		transport layer security library
 PKG_SECTION:=		libs/crypto
 PKG_DEPENDS:=		libgcrypt libtasn1 zlib libnettle libgmp
@@ -18,6 +18,7 @@ PKG_LIBNAME:=		libgnutls
 PKG_OPTS:=		dev
 
 PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
+PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
 
 PKG_SUBPKGS:=		LIBGNUTLS GNUTLS_UTILS LIBGNUTLS_EXTRA LIBGNUTLS_OPENSSL
 PKGSD_GNUTLS_UTILS:=	transport layer security utilities
@@ -31,12 +32,12 @@ PKG_FLAVOURS_LIBGNUTLS:=	WITH_CRYPTODEV
 PKGFD_WITH_CRYPTODEV:=		enable support for cryptodev-linux
 PKGFB_WITH_CRYPTODEV:=		cryptodev-linux
 
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS},${PKG_OPTS}))
-$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_GNUTLS_UTILS},${PKGSD_GNUTLS_UTILS},${PKGSC_GNUTLS_UTILS}))
-$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS_EXTRA}))
-$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS_OPENSSL}))
+$(eval $(call PKG_template,LIBGNUTLS,libgnutls,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_LIBGNUTLS),$(PKG_OPTS)))
+$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_GNUTLS_UTILS),$(PKGSD_GNUTLS_UTILS),$(PKGSC_GNUTLS_UTILS)))
+$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_LIBGNUTLS_EXTRA)))
+$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_LIBGNUTLS_OPENSSL)))
 
 ifneq ($(ADK_PACKAGE_LIBGNUTLS_WITH_CRYPTODEV),)
 CONFIGURE_ARGS+= 	--enable-cryptodev
@@ -49,22 +50,22 @@ CONFIGURE_ARGS+=	--disable-rpath \
 CONFIGURE_ENV+=		ac_cv_prog_AR='$(TARGET_CROSS)ar'
 
 libgnutls-install:
-	${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libgnutls.so* ${IDIR_LIBGNUTLS}/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBGNUTLS)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libgnutls.so* $(IDIR_LIBGNUTLS)/usr/lib
 
 libgnutls-extra-install:
-	${INSTALL_DIR} ${IDIR_LIBGNUTLS_EXTRA}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libgnutlsxx.so* \
-		${IDIR_LIBGNUTLS_EXTRA}/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBGNUTLS_EXTRA)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libgnutlsxx.so* \
+		$(IDIR_LIBGNUTLS_EXTRA)/usr/lib
 
 libgnutls-openssl-install:
-	${INSTALL_DIR} ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libgnutls-openssl.so* \
-		${IDIR_LIBGNUTLS_OPENSSL}/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBGNUTLS_OPENSSL)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libgnutls-openssl.so* \
+		$(IDIR_LIBGNUTLS_OPENSSL)/usr/lib
 
 gnutls-utils-install:
-	${INSTALL_DIR} ${IDIR_GNUTLS_UTILS}/usr/bin
-	${CP} ${WRKINST}/usr/bin/{{cert,srp,psk}tool,gnutls-{cli,serv}} \
-	    ${IDIR_GNUTLS_UTILS}/usr/bin
+	$(INSTALL_DIR) $(IDIR_GNUTLS_UTILS)/usr/bin
+	$(CP) $(WRKINST)/usr/bin/((cert,srp,psk)tool,gnutls-{cli,serv}) \
+	    $(IDIR_GNUTLS_UTILS)/usr/bin
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/htpdate/Makefile

@@ -1,27 +1,25 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		htpdate
-PKG_VERSION:=		1.0.5
+PKG_VERSION:=		1.1.1
 PKG_RELEASE:=		1
-PKG_HASH:=		f465059495eae91437eb5eec7af92f1374eb3836f50926e8e5718818abf91e9a
+PKG_HASH:=		0d75f91cb61f8869c8298d198fa52b9a139ae505b366e9d4d331af8bc1c04880
 PKG_DESCR:=		hypertext time protocol implementation
 PKG_SECTION:=		net/ntp
 PKG_URL:=		http://www.vervest.org/htp/
 PKG_SITES:=		http://www.vervest.org/htp/archive/c/
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+include $(ADK_TOPDIR)/mk/package.mk
 
-include ${ADK_TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,HTPDATE,htpdate,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,HTPDATE,htpdate,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 CONFIG_STYLE:=		manual
 
 htpdate-install:
-	${INSTALL_DIR} ${IDIR_HTPDATE}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/htpdate ${IDIR_HTPDATE}/usr/sbin/
+	$(INSTALL_DIR) $(IDIR_HTPDATE)/usr/sbin
+	$(INSTALL_BIN) $(WRKBUILD)/htpdate $(IDIR_HTPDATE)/usr/sbin/
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/htpdate/patches/patch-Makefile

@@ -1,35 +1,34 @@
---- htpdate-1.0.4.orig/Makefile	2008-10-13 21:04:08.000000000 +0200
-+++ htpdate-1.0.4/Makefile	2010-02-05 22:49:58.954334284 +0100
-@@ -2,8 +2,8 @@ prefix = /usr
+--- htpdate-1.1.1.orig/Makefile	2014-02-07 09:55:26.000000000 +0100
++++ htpdate-1.1.1/Makefile	2015-02-03 06:09:46.000000000 +0100
+@@ -2,12 +2,10 @@ prefix = $(DESTDIR)/usr
  bindir = ${prefix}/bin
  mandir = ${prefix}/share/man
  
 -CC = gcc
 -CFLAGS += -Wall -O2
+-#CFLAGS += -Wall -pedantic -ansi -O2
 +CC ?= gcc
-+CFLAGS ?= -Wall -O2
- #CFLAGS += -Wall -pedantic -ansi -O2
++CFLAGS ?=
  
  INSTALL = /usr/bin/install -c
-@@ -15,15 +15,14 @@ htpdate: htpdate.c
- 	$(CC) $(CFLAGS) -o htpdate htpdate.c
+-STRIP = /usr/bin/strip -s
+ 
+ all: htpdate
+ 
+@@ -15,16 +13,11 @@ htpdate: htpdate.c
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -o htpdate htpdate.c
  
  install: all
 -	$(STRIP) htpdate
--	mkdir -p $(bindir)
--	$(INSTALL) -m 755 htpdate $(bindir)/htpdate
+ 	mkdir -p $(bindir)
+ 	$(INSTALL) -m 755 htpdate $(bindir)/htpdate
 -	mkdir -p $(mandir)/man8
--	$(INSTALL) -m 644 htpdate.8.gz $(mandir)/man8/htpdate.8.gz
-+	mkdir -p $(DESTDIR)$(bindir)
-+	$(INSTALL) -m 755 htpdate $(DESTDIR)$(bindir)/htpdate
-+	mkdir -p $(DESTDIR)$(mandir)/man8
-+	$(INSTALL) -m 644 htpdate.8.gz $(DESTDIR)$(mandir)/man8/htpdate.8.gz
+-	$(INSTALL) -m 644 htpdate.8 $(mandir)/man8/htpdate.8
+-	gzip -f -9 $(mandir)/man8/htpdate.8
  
  clean:
  	rm -rf htpdate
  
  uninstall:
--	rm -rf $(bindir)/htpdate
+ 	rm -rf $(bindir)/htpdate
 -	rm -rf $(mandir)/man8/htpdate.8.gz
-+	rm -rf $(DESTDIR)$(bindir)/htpdate
-+	rm -rf $(DESTDIR)$(mandir)/man8/htpdate.8.gz

package/htpdate/patches/patch-htpdate_c

@@ -1,5 +1,5 @@
---- htpdate-1.0.4.orig/htpdate.c	2008-10-13 21:04:08.000000000 +0200
-+++ htpdate-1.0.4/htpdate.c	2010-02-05 22:48:28.624323989 +0100
+--- htpdate-1.1.1.orig/htpdate.c	2014-10-28 21:29:36.000000000 +0100
++++ htpdate-1.1.1/htpdate.c	2015-02-03 06:07:38.000000000 +0100
 @@ -353,6 +353,7 @@ static int setclock( double timedelta, i
  }
  
@@ -17,7 +17,7 @@
  
  static void showhelp() {
  	puts("htpdate version "VERSION"\n\
-@@ -406,7 +407,6 @@ Usage: htpdate [-046abdhlqstxD] [-i pid 
+@@ -406,7 +407,6 @@ Usage: htpdate [-046abdhlqstxD] [-i pid
    -s    set time\n\
    -t    turn off sanity time check\n\
    -u    run daemon as user\n\

package/kodi/Makefile

@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		kodi
 PKG_VERSION:=		14.0
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_HASH:=		11746d95cc59361f36ce6ea9d0d36bbd9ec3376e991f5ec1720f8ff740b91192
 PKG_DESCR:=		software media player
 PKG_SECTION:=		mm/video
@@ -119,7 +119,6 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--disable-mid \
 			--disable-debug \
 			--enable-alsa \
-			--enable-libvorbisenc \
 			--enable-texturepacker \
 			--enable-udev \
 			--with-ffmpeg=shared
@@ -181,7 +180,6 @@ ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
 CONFIGURE_ARGS+=	--disable-x11 \
 			--disable-sdl \
 			--enable-gles \
-			--enable-neon \
 			--enable-codec=imxvpu
 endif
 

package/libgcrypt/Makefile

@@ -1,12 +1,12 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libgcrypt
-PKG_VERSION:=		1.6.1
+PKG_VERSION:=		1.6.2
 PKG_RELEASE:=		1
-PKG_HASH:=		7c1007197bef49c3b8740cf6af8b4eb4eb74c7a69796ebcf555d928c287255de
+PKG_HASH:=		936921644b9c81e2395e18a554a9a5f9252aae3976f8afc3e4229ee9d785e627
 PKG_DESCR:=		crypto library
 PKG_SECTION:=		libs/crypto
 PKG_DEPENDS:=		libgpg-error
@@ -15,24 +15,24 @@ PKG_URL:=		http://directory.fsf.org/project/libgcrypt
 PKG_SITES:=		ftp://ftp.gnupg.org/gcrypt/libgcrypt/
 PKG_OPTS:=		dev
 
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 CONFIGURE_ARGS+=	--disable-asm \
-			--with-gpg-error-prefix="${STAGING_TARGET_DIR}/usr"
+			--with-gpg-error-prefix="$(STAGING_TARGET_DIR)/usr"
 
 post-install:
 	# provides own automake macros
-	${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/share/aclocal
-	${CP} ${WRKINST}/usr/share/aclocal/libgcrypt.m4 \
-		${STAGING_HOST_DIR}/usr/share/aclocal
+	$(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal
+	$(CP) $(WRKINST)/usr/share/aclocal/libgcrypt.m4 \
+		$(STAGING_HOST_DIR)/usr/share/aclocal
 
 libgcrypt-install:
-	${INSTALL_DIR} ${IDIR_LIBGCRYPT}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libgcrypt.so* \
-		${IDIR_LIBGCRYPT}/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBGCRYPT)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libgcrypt.so* \
+		$(IDIR_LIBGCRYPT)/usr/lib
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/libjpeg-turbo/Makefile

@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_HASH:=		c132907417ddc40ed552fe53d6b91d5fecbb14a356a60ddc7ea50d6be9666fb9
 PKG_DESCR:=		jpeg image library
 PKG_SECTION:=		libs/image
+PKG_BUILDDEP_IBM_X40:=	yasm-host
+PKG_BUILDDEP_QEMU_X86:=	yasm-host
 PKG_URL:=		http://libjpeg-turbo.virtualgl.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/}
 PKG_OPTS:=		dev

package/libressl/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libressl
-PKG_VERSION:=		2.1.2
+PKG_VERSION:=		2.1.3
 PKG_RELEASE:=		1
-PKG_HASH:=		07c05f12e5d49dbfcf82dd23b6b4877b7cdb1c8e4c8dd27cb4d9e5758a6caf52
+PKG_HASH:=		eb2f370971408fb10af6453e556465c8eee728ac333bf1eb47ec1a5112304f7c
 PKG_DESCR:=		ssl library
 PKG_SECTION:=		libs/crypto
 PKG_URL:=		http://www.libressl.org

package/libtasn1/Makefile

@@ -1,28 +1,28 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libtasn1
-PKG_VERSION:=		4.0
+PKG_VERSION:=		4.2
 PKG_RELEASE:=		1
-PKG_HASH:=		41d044f7644bdd1c4f8a5c15ac1885ca1fcbf32f5f6dd4760a19278b979857fe
+PKG_HASH:=		693b41cb36c2ac02d5990180b0712a79a591168e93d85f7fcbb75a0a0be4cdbb
 PKG_DESCR:=		asn.1 and der structures manipulation library
 PKG_SECTION:=		libs/crypto
 PKG_URL:=		http://www.gnupg.org/
-PKG_SITES:=		${MASTER_SITE_GNU:=libtasn1/}
+PKG_SITES:=		$(MASTER_SITE_GNU:=libtasn1/)
 PKG_OPTS:=		dev
 
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBTASN1,libtasn1,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBTASN1,libtasn1,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 CONFIGURE_ARGS+=	--disable-gtk-doc-html
 
 libtasn1-install:
-	${INSTALL_DIR} ${IDIR_LIBTASN1}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libtasn1.so* ${IDIR_LIBTASN1}/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBTASN1)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libtasn1.so* $(IDIR_LIBTASN1)/usr/lib
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/openjdk7/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		openjdk7
-PKG_VERSION:=		2.4.7
-PKG_RELEASE:=		9
-PKG_HASH:=		b66973bef7808f8fb03be64e44d312ea2d13590a68a6a4e6690dbcdd1947459d
+PKG_VERSION:=		2.5.3
+PKG_RELEASE:=		1
+PKG_HASH:=		f4f2922cfec262496e935f81c1d39af66a789f69aa12d1ceee51bcca8934f1f0
 PKG_DESCR:=		java virtual machine
 PKG_SECTION:=		dev/lang
 PKG_BUILDDEP:=		openjdk7-host alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups

target/arm/kernel/qemu-arm-stellaris-m3

@@ -0,0 +1,16 @@
+CONFIG_ARM=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_ARCH_REALVIEW=y
+CONFIG_MACH_REALVIEW_EB=y
+CONFIG_CPU_32=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_V7=y
+CONFIG_CPU_32v7M=y
+CONFIG_ARM_THUMB=y
+CONFIG_ARM_NVIC=y
+CONFIG_KUSER_HELPERS=y
+CONFIG_ARM_AMBA=y
+CONFIG_USE_OF=y
+CONFIG_ATAGS=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

target/config/Config.in.binfmt

@@ -3,26 +3,55 @@
 
 choice
 prompt "Binary Format"
-depends on ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_C6X
+depends on ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K || ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_C6X
 
 config ADK_TARGET_BINFMT_ELF
 	bool "ELF"
 	depends on !ADK_TARGET_ARCH_C6X
 	depends on !ADK_TARGET_ARCH_BFIN
+	depends on !ADK_TARGET_ARCH_ARM
 
 config ADK_TARGET_BINFMT_DSBT
 	bool "DSBT"
 	depends on ADK_TARGET_ARCH_C6X
 	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_M68K
+	depends on !ADK_TARGET_ARCH_ARM
 
 config ADK_TARGET_BINFMT_FDPIC
 	bool "FDPIC"
 	depends on ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_C6X
+	depends on !ADK_TARGET_ARCH_ARM
 
 config ADK_TARGET_BINFMT_FLAT
 	bool "FLAT"
 	depends on !ADK_TARGET_ARCH_C6X
+	depends on ADK_TARGET_ARCH_ARM && ADK_TARGET_UCLINUX
+
+endchoice
+
+# Set up flat binary type
+choice
+prompt "FLAT Binary type"
+depends on ADK_TARGET_BINFMT_FLAT
+default ADK_TARGET_BINFMT_FLAT_ONE
+
+config ADK_TARGET_BINFMT_FLAT_ONE
+        bool "One memory region"
+        help
+          All segments are linked into one memory region.
+
+config ADK_TARGET_BINFMT_FLAT_SEP_DATA
+        bool "Separate data and code region"
+        help
+          Allow for the data and text segments to be separated and placed in
+          different regions of memory.
+
+config ADK_TARGET_BINFMT_FLAT_SHARED
+        bool "Shared binary"
+        select ADK_TARGET_BINFMT_SUPPORTS_SHARED
+        help
+          Allow to load and link indiviual FLAT binaries at run time.
 
 endchoice

target/config/Config.in.kernel

@@ -36,6 +36,7 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "qemu-microblaze-ml605" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605
 	default "qemu-aarch64" if ADK_TARGET_SYSTEM_QEMU_AARCH64
 	default "qemu-arm-versatilepb" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
+	default "qemu-arm-stellaris-m3" if ADK_TARGET_QEMU_ARM_MODEL_STELLARIS_M3
 	default "qemu-arm-vexpress-a9" if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
 	default "qemu-arm-spitz" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	default "qemu-arm-terrier" if ADK_TARGET_QEMU_ARM_MODEL_TERRIER

target/config/Config.in.libc.default

@@ -33,6 +33,8 @@ config ADK_LIBC_VERSION
 
 config ADK_TARGET_WITH_NPTL
 	boolean
+	default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM && ADK_TARGET_UCLINUX
+	default n if ADK_TARGET_LIB_UCLIBC && ADK_TARGET_ARCH_ARM && ADK_TARGET_UCLINUX
 	default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_AVR32
 	default n if ADK_TARGET_LIB_UCLIBC && ADK_TARGET_ARCH_AVR32
 	default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_CRIS

toolchain/elf2flt/Makefile

@@ -6,7 +6,7 @@ include Makefile.inc
 include ../rules.mk
 include ${ADK_TOPDIR}/mk/buildhlp.mk
 
-BINUTILS_VERSION:=	git
+BINUTILS_VERSION:=	2.24
 
 $(WRKBUILD)/.headers:
 $(WRKBUILD)/.configured:

toolchain/elf2flt/Makefile.inc

@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		elf2flt
-PKG_VERSION:=		20140814
+PKG_VERSION:=		20150129
 PKG_RELEASE:=		1
-PKG_HASH:=		c284abd28aaaa3e95dd6ab1d08a0cf5e8586bf2989f21e696f98eb71bfc64cdf
+PKG_HASH:=		b52b0d14f13af559c0b22578853a893cdc45025ea65779f9a8d759201e5409ed
 PKG_SITES:=		http://www.openadk.org/distfiles/

toolchain/gcc/Makefile

@@ -284,10 +284,18 @@ endif
 		ln -sf libstdc++.so.6.0.$(LIBSTDCXXVER) libstdc++.so.6
 	# cleanup unneeded docs
 	rm -rf $(TOOLCHAIN_DIR)/usr/share
+ifeq ($(ADK_TARGET_ARCH_M68K),y)
 	# create gcc wrapper for uClinux/m68k
 	echo "#!/bin/sh" > $(TOOLCHAIN_DIR)/usr/bin/adk-uclinux-gcc
 	echo "exec ${GNU_TARGET_NAME}-gcc \"\$$@\" -specs $(ADK_TOPDIR)/toolchain/gcc/m68k-uclinux-gcc.specs" >> $(TOOLCHAIN_DIR)/usr/bin/adk-uclinux-gcc
 	chmod a+x $(TOOLCHAIN_DIR)/usr/bin/adk-uclinux-gcc
+endif
+ifeq ($(ADK_TARGET_ARCH_ARM),y)
+	# create gcc wrapper for uClinux/arm
+	echo "#!/bin/sh" > $(TOOLCHAIN_DIR)/usr/bin/adk-uclinux-gcc
+	echo "exec ${GNU_TARGET_NAME}-gcc \"\$$@\" -specs $(ADK_TOPDIR)/toolchain/gcc/arm-uclinux-gcc.specs" >> $(TOOLCHAIN_DIR)/usr/bin/adk-uclinux-gcc
+	chmod a+x $(TOOLCHAIN_DIR)/usr/bin/adk-uclinux-gcc
+endif
 	touch $@
 
 include ${ADK_TOPDIR}/mk/toolchain.mk

toolchain/gcc/arm-uclinux-gcc.specs

@@ -0,0 +1,153 @@
+*asm:
+%{mbig-endian:-EB} %{mlittle-endian:-EL} %(asm_cpu_spec) %{mapcs-*:-mapcs-%*} %(subtarget_asm_float_spec) %{mthumb-interwork:-mthumb-interwork} %{mfloat-abi=*} %{mfpu=*} %(subtarget_extra_asm_spec)
+
+*asm_debug:
+%{!g0:%{gstabs*:--gstabs}%{!gstabs*:%{g*:--gdwarf2}}} %{fdebug-prefix-map=*:--debug-prefix-map %*}
+
+*asm_final:
+%{gsplit-dwarf: 
+       objcopy --extract-dwo 	 %{c:%{o*:%*}%{!o*:%b%O}}%{!c:%U%O} 	 %{c:%{o*:%:replace-extension(%{o*:%*} .dwo)}%{!o*:%b.dwo}}%{!c:%b.dwo} 
+       objcopy --strip-dwo 	 %{c:%{o*:%*}%{!o*:%b%O}}%{!c:%U%O}     }
+
+*asm_options:
+%{-target-help:%:print-asm-header()} %{v} %{w:-W} %{I*} %a %Y %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}
+
+*invoke_as:
+%{!fwpa:   %{fcompare-debug=*|fdump-final-insns=*:%:compare-debug-dump-opt()}   %{!S:-o %|.s |
+ as %(asm_options) %m.s %A }  }
+
+*cpp:
+%(subtarget_cpp_spec)					%{mfloat-abi=soft:%{mfloat-abi=hard:						%e-mfloat-abi=soft and -mfloat-abi=hard may not be used together}} %{mbig-endian:%{mlittle-endian:							%e-mbig-endian and -mlittle-endian may not be used together}}
+
+*cpp_options:
+%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w} %{f*} %{g*:%{!g0:%{g*} %{!fno-working-directory:-fworking-directory}}} %{O*} %{undef} %{save-temps*:-fpch-preprocess}
+
+*cpp_debug_options:
+%{d*}
+
+*cpp_unique_options:
+%{!Q:-quiet} %{nostdinc*} %{C} %{CC} %{v} %{I*&F*} %{P} %I %{MD:-MD %{!o:%b.d}%{o*:%.d%*}} %{MMD:-MMD %{!o:%b.d}%{o*:%.d%*}} %{M} %{MM} %{MF*} %{MG} %{MP} %{MQ*} %{MT*} %{!E:%{!M:%{!MM:%{!MT:%{!MQ:%{MD|MMD:%{o*:-MQ %*}}}}}}} %{remap} %{g3|ggdb3|gstabs3|gcoff3|gxcoff3|gvms3:-dD} %{!iplugindir*:%{fplugin*:%:find-plugindir()}} %{H} %C %{D*&U*&A*} %{i*} %Z %i %{fmudflap:-D_MUDFLAP -include mf-runtime.h} %{fmudflapth:-D_MUDFLAP -D_MUDFLAPTH -include mf-runtime.h} %{E|M|MM:%W{o*}}
+
+*trad_capable_cpp:
+cc1 -E %{traditional|traditional-cpp:-traditional-cpp}
+
+*cc1:
+%{profile:-p}
+
+*cc1_options:
+%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}} %{!iplugindir*:%{fplugin*:%:find-plugindir()}} %1 %{!Q:-quiet} %{!dumpbase:-dumpbase %B} %{d*} %{m*} %{aux-info*} %{fcompare-debug-second:%:compare-debug-auxbase-opt(%b)}  %{!fcompare-debug-second:%{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}}%{!c:%{!S:-auxbase %b}}  %{g*} %{O*} %{W*&pedantic*} %{w} %{std*&ansi&trigraphs} %{v:-version} %{pg:-p} %{p} %{f*} %{undef} %{Qn:-fno-ident} %{Qy:} %{-help:--help} %{-target-help:--target-help} %{-version:--version} %{-help=*:--help=%*} %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}} %{fsyntax-only:-o %j} %{-param*} %{fmudflap|fmudflapth:-fno-builtin -fno-merge-constants} %{coverage:-fprofile-arcs -ftest-coverage}
+
+*cc1plus:
+
+
+*link_gcc_c_sequence:
+%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}
+
+*link_ssp:
+%{fstack-protector:}
+
+*endfile:
+crtend%O%s crtn%O%s
+
+*link:
+%{mbig-endian:-EB} %{mlittle-endian:-EL} %{static:-Bstatic} %{shared:-shared} %{symbolic:-Bsymbolic} -X -m armelf_linux_eabi -elf2flt --pic-veneer --target2=abs %{mcpu=arm8|mcpu=arm810|mcpu=strongarm*|march=armv4|mcpu=fa526|mcpu=fa626:--fix-v4bx} %{mbig-endian:%{march=armv7-a|mcpu=cortex-a5           |mcpu=cortex-a7                                         |mcpu=cortex-a8|mcpu=cortex-a9|mcpu=cortex-a15          |mcpu=marvell-pj4					   |mcpu=generic-armv7-a                                   |march=armv7-m|mcpu=cortex-m3                           |march=armv7e-m|mcpu=cortex-m4                          |march=armv6-m|mcpu=cortex-m0                           |march=armv8-a					   :%{!r:--be8}}}
+
+*lib:
+%{pthread:-lpthread}    %{shared:-lc}    %{!shared:%{profile:-lc_p}%{!profile:-lc}}
+
+*mfwrap:
+ %{static: %{fmudflap|fmudflapth:  --wrap=malloc --wrap=free --wrap=calloc --wrap=realloc --wrap=mmap --wrap=mmap64 --wrap=munmap --wrap=alloca} %{fmudflapth: --wrap=pthread_create}} %{fmudflap|fmudflapth: --wrap=main}
+
+*mflib:
+%{fmudflap|fmudflapth: -export-dynamic}
+
+*link_gomp:
+
+
+*libgcc:
+-lgcc
+
+*startfile:
+crt1%O%s crti%O%s crtbegin%O%s
+
+*cross_compile:
+1
+
+*version:
+4.8.4
+
+*multilib:
+. ;
+
+*multilib_defaults:
+marm mlittle-endian mfloat-abi=soft mno-thumb-interwork fno-leading-underscore
+
+*multilib_extra:
+
+
+*multilib_matches:
+
+
+*multilib_exclusions:
+
+
+*multilib_options:
+
+
+*multilib_reuse:
+
+
+*linker:
+collect2
+
+*linker_plugin_file:
+
+
+*lto_wrapper:
+
+
+*lto_gcc:
+
+
+*link_libgcc:
+%D
+
+*md_exec_prefix:
+
+
+*md_startfile_prefix:
+
+
+*md_startfile_prefix_1:
+
+
+*startfile_prefix_spec:
+
+
+*sysroot_spec:
+--sysroot=%R
+
+*sysroot_suffix_spec:
+
+
+*sysroot_hdrs_suffix_spec:
+
+
+*self_spec:
+
+
+*subtarget_cpp_spec:
+%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}
+
+*asm_cpu_spec:
+ %{mcpu=generic-*:-march=%*;   :%{mcpu=*:-mcpu=%*} %{march=*:-march=%*}}
+
+*subtarget_extra_asm_spec:
+%{mabi=apcs-gnu|mabi=atpcs:-meabi=gnu;:-meabi=5} %{mcpu=arm8|mcpu=arm810|mcpu=strongarm*|march=armv4|mcpu=fa526|mcpu=fa626:--fix-v4bx}
+
+*subtarget_asm_float_spec:
+%{mapcs-float:-mfloat}
+
+*link_command:
+%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:    %(linker) %{fuse-linker-plugin:    %e-fuse-linker-plugin is not supported in this configuration}%{flto|flto=*:%<fcompare-debug*}     %{flto} %{flto=*} %l %{pie:-pie} %{fuse-ld=*:-fuse-ld=%*}    %X %{o*} %{e*} %{N} %{n} %{r}    %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}}    %{static:} %{L*} %(mfwrap) %(link_libgcc) %{!nostdlib:%{!nodefaultlibs:%{fsanitize=address:}     %{fsanitize=thread:}}} %o    %{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)}    %{fgnu-tm:%:include(libitm.spec)%(link_itm)}    %(mflib)  %{fsplit-stack: --wrap=pthread_create}    %{fprofile-arcs|fprofile-generate*|coverage:-lgcov} %{!nostdlib:%{!nodefaultlibs:%{fsanitize=address:%{static-libasan:-Bstatic} -lasan %{static-libasan:-Bdynamic}    %{static:%ecannot specify -static with -fsanitize=address}    %{fsanitize=thread:%e-fsanitize=address is incompatible with -fsanitize=thread}}    %{fsanitize=thread:%{static-libtsan:-Bstatic} -ltsan %{static-libtsan:-Bdynamic}    %{!pie:%{!shared:%e-fsanitize=thread linking must be done with -pie or -shared}}}}}     %{!nostdlib:%{!nodefaultlibs:%(link_ssp) %(link_gcc_c_sequence)}}    %{!nostdlib:%{!nostartfiles:%E}} %{T*} }}}}}}
+

toolchain/uclibc-ng/Makefile

@@ -36,6 +36,20 @@ endif
 ifeq ($(ADK_TARGET_UCLINUX),y)
 	$(SED) 's/.*\(ARCH_USE_MMU\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
+ifeq ($(ADK_TARGET_WITH_NPTL),y)
+	$(SED) 's/.*\(UCLIBC_HAS_THREADS_NATIVE\).*/\1=y/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(UCLIBC_HAS_TLS\).*/\1=y/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(PTHREADS_DEBUG_SUPPORT\).*/\1=y/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(LINUXTHREADS_OLD\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(LINUXTHREADS_NEW\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(HAS_NO_THREADS\).*/# \1 is not set/' ${WRKBUILD}/.config
+else
+	$(SED) 's/.*\(UCLIBC_HAS_THREADS_NATIVE\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(UCLIBC_HAS_TLS\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(LINUXTHREADS_OLD\).*/\1=y/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(LINUXTHREADS_NEW\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(HAS_NO_THREADS\).*/# \1 is not set/' ${WRKBUILD}/.config
+endif	
 ifeq ($(ADK_TARGET_USE_STATIC_LIBS)$(ADK_TARGET_BINFMT_FLAT),)
 	$(SED) 's/.*\(HAVE_SHARED\).*/\1=y/' ${WRKBUILD}/.config
 else