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

Config.in

@@ -91,6 +91,9 @@ source "package/Config.in.auto.global"
 source "package/Config.in.auto"
 endmenu
 
+config ADK_USE_KERNEL_MINICONFIG
+	boolean
+
 choice
 prompt "Kernel Version"
 depends on ADK_TOOLCHAIN_ONLY

TODO

@@ -1,3 +1,4 @@
+- microblaze: add cfgfs partition to dts, add partition to spartan dts
 - use host-tools infrastructure for openjdk7
 - remove openjdk6
 - evaluate libguestfs for image creation
@@ -5,6 +6,3 @@
 - check for gcc and SSP again
 - port full blown perl
 - port w3m
-- port libcec for xbmc
-- check xbmc samba/nfs support
-- add support for librtmp in xbmc

mk/build.mk

@@ -36,6 +36,7 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_URLGRABBER=n \
 			ADK_PACKAGE_PERL=n \
 			ADK_PACKAGE_LIBSSP=n \
+			ADK_PACKAGE_OPENAFS=n \
 			ADK_PKG_XORG=n \
 			ADK_PKG_MPDBOX=n \
 			ADK_PKG_DEVELOPMENT=n \
@@ -99,7 +100,7 @@ POSTCONFIG=		-@\
 			touch .rebuild.busybox;\
 			rebuild=1;\
 		fi; \
-		for i in ADK_RUNTIME_PASSWORD ADK_RUNTIME_TMPFS_SIZE ADK_RUNTIME_HOSTNAME ADK_TARGET_ROOTFS ADK_RUNTIME_CONSOLE;do \
+		for i in ADK_RUNTIME_PASSWORD ADK_RUNTIME_TMPFS_SIZE ADK_RUNTIME_HOSTNAME ADK_TARGET_ROOTFS ADK_RUNTIME_CONSOLE ADK_TARGET_QEMU_MICROBLAZE_MODEL;do \
 			if [ "$$(grep ^$$i .config|md5sum)" != "$$(grep ^$$i .config.old|md5sum)" ];then \
 				touch .rebuild.base-files;\
 				rebuild=1;\
@@ -572,8 +573,9 @@ release:
 			$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
 			rm .config; \
 		) 2>&1 | tee $(TOPDIR)/bin/$(SYSTEM)_$(ARCH)_$$libc/build.log; \
-		if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \
+		if [ -f .exit ];then echo "Bulk build failed!"; break;fi \
 	done
+	if [ -f .exit ];then rm .exit;exit 1;fi
 
 # build all target architecture, target systems and libc combinations
 bulk:

mk/image.mk

@@ -119,14 +119,18 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
 TARGET_KERNEL=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_FS}-kernel
 INITRAMFS=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}
 ROOTFSSQUASHFS=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img
+ROOTFSJFFS2=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-jffs2.img
 ROOTFSTARBALL=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz
 ROOTFSUSERTARBALL=	${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz
+ROOTFSISO=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso
 else
 TARGET_KERNEL=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_FS}-kernel
 INITRAMFS=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}
 ROOTFSSQUASHFS=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img
+ROOTFSJFFS2=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-jffs2.img
 ROOTFSTARBALL=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz
 ROOTFSUSERTARBALL=	${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz
+ROOTFSISO=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso
 endif
 
 ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package
@@ -159,43 +163,89 @@ ${BIN_DIR}/${INITRAMFS}: ${BIN_DIR}/${INITRAMFS}_list
 
 ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
 	${STAGING_HOST_DIR}/bin/mksquashfs ${TARGET_DIR} \
-		${BUILD_DIR}/root.squashfs \
+		${BUILD_DIR}/root.squashfs -comp xz \
 		-nopad -noappend -root-owned $(MAKE_TRACE)
 
+${BIN_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR}
+	${STAGING_HOST_DIR}/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -r ${TARGET_DIR} \
+		--pad=$(ADK_TARGET_MTD_SIZE) -o ${BIN_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE)
+
 createinitramfs: ${BIN_DIR}/${INITRAMFS}_list
 	${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE|INITRAMFS_COMPRESSION).*//' \
 		${LINUX_DIR}/.config
 	( \
 		echo "CONFIG_BLK_DEV_INITRD=y"; \
 		echo 'CONFIG_INITRAMFS_SOURCE="${BIN_DIR}/${INITRAMFS}_list"'; \
-		echo 'CONFIG_INITRAMFS_COMPRESSION_NONE is not set' >> ${LINUX_DIR}/.config; \
+		echo '# CONFIG_INITRAMFS_COMPRESSION_NONE is not set' >> ${LINUX_DIR}/.config; \
+		echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> ${LINUX_DIR}/.config; \
+		echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> ${LINUX_DIR}/.config; \
 	) >> ${LINUX_DIR}/.config
 ifeq ($(ADK_KERNEL_COMP_XZ),y)
+		echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config
 		echo "CONFIG_RD_XZ=y" >> ${LINUX_DIR}/.config
 		echo "CONFIG_INITRAMFS_COMPRESSION_XZ=y" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_X86=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_POWERPC=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_IA64=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_ARM=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_ARMTHUMB=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_SPARC=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_XZ_DEC_TEST=n" >> ${LINUX_DIR}/.config
 endif
 ifeq ($(ADK_KERNEL_COMP_LZMA),y)
+		echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config
 		echo "CONFIG_RD_LZMA=y" >> ${LINUX_DIR}/.config
 		echo "CONFIG_INITRAMFS_COMPRESSION_LZMA=y" >> ${LINUX_DIR}/.config
 endif
 ifeq ($(ADK_KERNEL_COMP_LZO),y)
+		echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config
 		echo "CONFIG_RD_LZO=y" >> ${LINUX_DIR}/.config
 		echo "CONFIG_INITRAMFS_COMPRESSION_LZO=y" >> ${LINUX_DIR}/.config
 endif
 ifeq ($(ADK_KERNEL_COMP_GZIP),y)
+		echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config
 		echo "CONFIG_RD_GZIP=y" >> ${LINUX_DIR}/.config
 		echo "CONFIG_INITRAMFS_COMPRESSION_GZIP=y" >> ${LINUX_DIR}/.config
 endif
 ifeq ($(ADK_KERNEL_COMP_BZIP2),y)
+		echo "CONFIG_RD_XZ=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_GZIP=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZMA=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZO=n" >> ${LINUX_DIR}/.config
+		echo "CONFIG_RD_LZ4=n" >> ${LINUX_DIR}/.config
 		echo "CONFIG_RD_BZIP2=y" >> ${LINUX_DIR}/.config
 		echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config
 endif
 	@-rm $(LINUX_DIR)/usr/initramfs_data.cpio* 2>/dev/null
-	echo N | \
-	$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} oldconfig $(MAKE_TRACE) 
 	$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
 		ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE)
 
+${BIN_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package
+	mkdir -p ${TARGET_DIR}/boot/syslinux
+	cp ${STAGING_HOST_DIR}/usr/share/syslinux/{isolinux.bin,ldlinux.c32} \
+		${TARGET_DIR}/boot/syslinux
+	echo 'DEFAULT /boot/kernel root=/dev/sr0 init=/init' > \
+		${TARGET_DIR}/boot/syslinux/isolinux.cfg
+	${TOOLS_DIR}/mkisofs -R -uid 0 -gid 0 -o $@ \
+		-b boot/syslinux/isolinux.bin \
+		-c boot/syslinux/boot.cat -no-emul-boot \
+		-boot-load-size 4 -boot-info-table ${TARGET_DIR}
+
 imageclean:
 	rm -f $(BIN_DIR)/$(ADK_TARGET_SYSTEM)-* ${BUILD_DIR}/$(ADK_TARGET_SYSTEM)-*

mk/kernel-build.mk

@@ -35,8 +35,13 @@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PK
 $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR)/mk/modules.mk
 	$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-configure
 	-for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done
+ifeq ($(ADK_USE_KERNEL_MINICONFIG),y)
+	$(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/mini.config
+	${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE)
+else
 	$(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config
 	echo N | ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} oldconfig $(MAKE_TRACE)
+endif
 	${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} prepare scripts $(MAKE_TRACE)
 	touch -c $(LINUX_DIR)/.config
 

mk/kernel-ver.mk

@@ -2,7 +2,7 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
 KERNEL_VERSION:=	3.11.10
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		edbf88eb7f7d34dbd5d3887726790755
+KERNEL_MD5SUM:=		59f352d3f4e2cdf6755f79e09fa09176
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_11_10),y)
 KERNEL_VERSION:=	3.11.10

mk/pkg-bottom.mk

@@ -180,7 +180,7 @@ ifneq (,$(filter dev,${PKG_OPTS}))
 	done
 endif
 	@-cd ${WRKINST}; \
-	    if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" ];then \
+	    if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" -a "${PKG_NAME}" != "pam" ];then \
 	    find lib \( -name lib\*.so\* -o -name lib\*.a \) \
 	    	-exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \
 		' fix this!' >&2 \; -quit 2>/dev/null; fi;\

mk/qemu.mk

@@ -0,0 +1,34 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+ifeq ($(CPU_ARCH),arm)
+QEMU:=			qemu-arm
+endif
+ifeq ($(CPU_ARCH),mipsel)
+QEMU:=			qemu-mipsel
+endif
+ifeq ($(CPU_ARCH),mips64el)
+QEMU:=			qemu-mipsel
+endif
+ifeq ($(CPU_ARCH),mips)
+QEMU:=			qemu-mips
+endif
+ifeq ($(CPU_ARCH),mips64)
+QEMU:=			qemu-mips
+endif
+ifeq ($(CPU_ARCH),ppc)
+QEMU:=			qemu-ppc
+endif
+ifeq ($(CPU_ARCH),i486)
+QEMU:=			qemu-i386
+endif
+ifeq ($(CPU_ARCH),i586)
+QEMU:=			qemu-i386
+endif
+ifeq ($(CPU_ARCH),i686)
+QEMU:=			qemu-i386
+endif
+ifeq ($(CPU_ARCH),x86_64)
+QEMU:=			qemu-x86_64
+endif
+

mk/rootfs.mk

@@ -9,6 +9,7 @@ endif
 endef
 
 ifeq ($(ADK_HARDWARE_QEMU),y)
+MTDDEV:=	root=/dev/mtdblock0
 ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y)
 ROOTFS:=	root=/dev/sda1
 endif
@@ -50,7 +51,9 @@ $(eval $(call rootfs_template,initramfs,INITRAMFS))
 $(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK))
 $(eval $(call rootfs_template,squashfs,SQUASHFS,$(ROOTFS)))
 $(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3))
+$(eval $(call rootfs_template,jffs2,JFFS2,$(MTDDEV) rootfstype=jffs2))
 $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init))
 $(eval $(call rootfs_template,encrypted,ENCRYPTED))
+$(eval $(call rootfs_template,iso,ISO))
 
 export ADK_TARGET_FS

mk/vars.mk

@@ -160,8 +160,7 @@ HOST_CONFIGURE_OPTS=	CC_FOR_BUILD='${CC_FOR_BUILD}' \
 			CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \
 			CXX_FOR_BUILD='${CXX_FOR_BUILD}' \
 			CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \
-			LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}' \
-			QEMU='$(QEMU)'
+			LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}'
 
 PKG_SUFFIX:=		$(strip $(subst ",, $(ADK_PACKAGE_SUFFIX)))
 

package/DirectFB/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		DirectFB
 PKG_VERSION:=		1.6.3
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_EXTRAVER:=		1.6-0
 PKG_MD5SUM:=		641e8e999c017770da647f9b5b890906
 PKG_DESCR:=		Thin graphic library for the Linux framebuffer devices

package/DirectFB/patches/patch-lib_direct_os_linux_glibc_system_c

@@ -0,0 +1,19 @@
+--- DirectFB-1.6.3.orig/lib/direct/os/linux/glibc/system.c	2013-01-18 15:57:11.000000000 +0100
++++ DirectFB-1.6.3/lib/direct/os/linux/glibc/system.c	2013-12-21 12:48:06.000000000 +0100
+@@ -33,6 +33,7 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <unistd.h>
++#include <sys/syscall.h>
+ 
+ #include <linux/unistd.h>
+ 
+@@ -107,7 +108,7 @@ direct_tgkill( int tgid, int tid, int si
+ void
+ direct_trap( const char *domain, int sig )
+ {
+-     sigval_t val;
++     union sigval val;
+ 
+      D_LOG( Direct_Trap, VERBOSE, "Raising signal %d from %s...\n", sig, domain );
+ 

package/alsa-lib/patches/patch-libtool

@@ -0,0 +1,177 @@
+--- alsa-lib-1.0.27.2.orig/libtool	2013-07-08 14:32:53.000000000 +0200
++++ alsa-lib-1.0.27.2/libtool	2013-12-30 17:42:30.000000000 +0100
+@@ -1,8 +1,8 @@
+-#! /bin/sh
++#! /bin/bash
+ 
+ # libtool - Provide generalized library-building support services.
+ # Generated automatically by config.status (alsa-lib) 1.0.27.2
+-# Libtool was configured on host alsa.alsa-project.org:
++# Libtool was configured on host helium:
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+ #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+@@ -40,7 +40,7 @@ available_tags=""
+ # ### BEGIN LIBTOOL CONFIG
+ 
+ # Whether or not to build static libraries.
+-build_old_libs=no
++build_old_libs=yes
+ 
+ # Which release of libtool.m4 was used?
+ macro_version=2.4.2
+@@ -56,7 +56,7 @@ pic_mode=default
+ fast_install=yes
+ 
+ # Shell to use when invoking shell scripts.
+-SHELL="/bin/sh"
++SHELL="/bin/bash"
+ 
+ # An echo program that protects backslashes.
+ ECHO="printf %s\\n"
+@@ -65,38 +65,38 @@ ECHO="printf %s\\n"
+ PATH_SEPARATOR=":"
+ 
+ # The host system.
+-host_alias=
+-host=x86_64-unknown-linux-gnu
++host_alias=i686-openadk-linux
++host=i686-openadk-linux-gnu
+ host_os=linux-gnu
+ 
+ # The build system.
+-build_alias=
+-build=x86_64-unknown-linux-gnu
++build_alias=x86_64-linux-gnu
++build=x86_64-pc-linux-gnu
+ build_os=linux-gnu
+ 
+ # A sed program that does not truncate output.
+-SED="/usr/bin/sed"
++SED="/home/wbx/ibmx40/scripts/sed"
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+ Xsed="$SED -e 1s/^X//"
+ 
+ # A grep program that handles long lines.
+-GREP="/usr/bin/grep"
++GREP="/bin/grep"
+ 
+ # An ERE matcher.
+-EGREP="/usr/bin/grep -E"
++EGREP="/bin/grep -E"
+ 
+ # A literal string matcher.
+-FGREP="/usr/bin/grep -F"
++FGREP="/bin/grep -F"
+ 
+ # A BSD- or MS-compatible name lister.
+-NM="/usr/bin/nm -B"
++NM="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-nm"
+ 
+ # Whether we need soft or hard links.
+ LN_S="ln -s"
+ 
+ # What is the maximum length of a command?
+-max_cmd_len=1572864
++max_cmd_len=3458764513820540925
+ 
+ # Object file suffix (normally "o").
+ objext=o
+@@ -120,7 +120,7 @@ to_host_file_cmd=func_convert_file_noop
+ to_tool_file_cmd=func_convert_file_noop
+ 
+ # An object symbol dumper.
+-OBJDUMP="objdump"
++OBJDUMP="i686-openadk-linux-objdump"
+ 
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method="pass_all"
+@@ -141,7 +141,7 @@ DLLTOOL="false"
+ sharedlib_from_linklib_cmd="printf %s\\n"
+ 
+ # The archiver.
+-AR="ar"
++AR="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-ar"
+ 
+ # Flags to create an archive.
+ AR_FLAGS="cru"
+@@ -150,10 +150,10 @@ AR_FLAGS="cru"
+ archiver_list_spec="@"
+ 
+ # A symbol stripping program.
+-STRIP="strip"
++STRIP="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-strip"
+ 
+ # Commands used to install an old-style archive.
+-RANLIB="ranlib"
++RANLIB="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-ranlib"
+ old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$tool_oldlib"
+ old_postuninstall_cmds=""
+ 
+@@ -161,10 +161,10 @@ old_postuninstall_cmds=""
+ lock_old_archive_extraction=no
+ 
+ # A C compiler.
+-LTCC="gcc"
++LTCC="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-gcc"
+ 
+ # LTCC compiler flags.
+-LTCFLAGS="-O2 -fomit-frame-pointer -Wall -pipe -D_GNU_SOURCE"
++LTCFLAGS="-march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -fno-unwind-tables -fno-asynchronous-unwind-tables -g3 -D_GNU_SOURCE"
+ 
+ # Take the output of nm and produce a listing of raw symbols and C names.
+ global_symbol_pipe="sed -n -e 's/^.*[	 ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[	 ][	 ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'"
+@@ -272,27 +272,27 @@ finish_eval=""
+ hardcode_into_libs=yes
+ 
+ # Compile-time system search path for libraries.
+-sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.7.2 /usr/lib64 /lib64 "
++sys_lib_search_path_spec="/home/wbx/ibmx40/host_i686_musl_musl/lib/gcc/i686-openadk-linux-musl/4.7.3 /home/wbx/ibmx40/host_i686_musl_musl/i686-openadk-linux-musl/lib /home/wbx/ibmx40/target_i686_musl_musl/lib /home/wbx/ibmx40/target_i686_musl_musl/usr/lib "
+ 
+ # Run-time system search path for libraries.
+-sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/mysql /usr/lib64/qt-3.3/lib "
++sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu "
+ 
+ # Whether dlopen is supported.
+ dlopen_support=yes
+ 
+ # Whether dlopen of programs is supported.
+-dlopen_self=yes
++dlopen_self=unknown
+ 
+ # Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=yes
++dlopen_self_static=unknown
+ 
+ # Commands to strip libraries.
+-old_striplib="strip --strip-debug"
+-striplib="strip --strip-unneeded"
++old_striplib="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-strip --strip-debug"
++striplib="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-strip --strip-unneeded"
+ 
+ 
+ # The linker used to build libraries.
+-LD="/usr/bin/ld -m elf_x86_64"
++LD="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-ld"
+ 
+ # How to create reloadable object files.
+ reload_flag=" -r"
+@@ -302,7 +302,7 @@ reload_cmds="\$LD\$reload_flag -o \$outp
+ old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib"
+ 
+ # A language specific compiler.
+-CC="gcc"
++CC="/home/wbx/ibmx40/host_i686_musl_musl/bin/i686-openadk-linux-musl-gcc"
+ 
+ # Is the compiler the GNU compiler?
+ with_gcc=yes
+@@ -317,7 +317,7 @@ pic_flag=" -fPIC -DPIC"
+ wl="-Wl,"
+ 
+ # Compiler flag to prevent dynamic linking.
+-link_static_flag=""
++link_static_flag="-static"
+ 
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o="yes"

package/alsa-lib/patches/patch-utils_alsa_pc_in

@@ -0,0 +1,12 @@
+--- alsa-lib-1.0.27.2.orig/utils/alsa.pc.in	2013-07-08 14:31:36.000000000 +0200
++++ alsa-lib-1.0.27.2/utils/alsa.pc.in	2014-01-01 17:07:29.000000000 +0100
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++libdir=${prefix}/lib
++includedir=${prefix}/include
+ 
+ Name: alsa
+ Description: Advanced Linux Sound Architecture (ALSA) - Library

package/asterisk/Makefile

@@ -18,6 +18,7 @@ PKG_NOPARALLEL:=	1
 PKG_NEED_CXX:=		1
 
 PKG_ARCH_DEPENDS:=	!cris
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
 PKG_SUBPKGS:=		ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS
 PKG_SUBPKGS+=		ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM

package/base-files/Makefile

@@ -72,10 +72,7 @@ endif
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC64),y)
 	$(SED) 's#ttyS#hvc#g' $(IDIR_BASE_FILES)/etc/inittab
 endif
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_MICROBLAZE),y)
-	$(SED) 's#ttyS#ttyUL#g' $(IDIR_BASE_FILES)/etc/inittab
-endif
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL),y)
+ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800),y)
 	$(SED) 's#ttyS#ttyUL#g' $(IDIR_BASE_FILES)/etc/inittab
 endif
 	$(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab

package/binutils/Makefile

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

package/bluez-firmware/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1cc3cefad872e937e05de5a0a2b390dd
 PKG_DESCR:=		Bluez firmware for BCM2033
-PKG_SECTION:=		bluetooth
+PKG_SECTION:=		misc
 PKG_DEPENDS:=		kmod-bt bluez
 PKG_URL:=		http://www.bluez.org/
 PKG_SITES:=		http://bluez.sourceforge.net/download/

package/bluez/Makefile

@@ -4,47 +4,34 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bluez
-PKG_VERSION:=		4.101
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		fb42cb7038c380eb0e2fa208987c96ad
+PKG_VERSION:=		5.12
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		981b34c2ae7e2ed2e25a167d8a902a25
 PKG_DESCR:=		bluetooth applications
-PKG_SECTION:=		bluetooth
-PKG_DEPENDS:=		kmod-bt libbluetooth
+PKG_SECTION:=		misc	
+PKG_DEPENDS:=		kmod-bt glib dbus libreadline
+PKG_BUILDDEP:=		autotool glib dbus readline
 PKG_URL:=		http://www.bluez.org/
 PKG_SITES:=		http://mirror.anl.gov/pub/linux/bluetooth/
-PKG_LIBNAME:=		libbluetooth
 PKG_OPTS:=		dev
 
-PKG_SUBPKGS:=		BLUEZ LIBBLUETOOTH
-PKGSC_LIBBLUETOOTH:=	libs
-PKGSD_LIBBLUETOOTH:=	bluetooth libraries
-PKGSS_LIBBLUETOOTH:=	glib libusb dbus libusb-compat
-PKGSB_LIBBLUETOOTH:=	glib libusb dbus libusb-compat
-
 PKG_ARCH_DEPENDS:=	!avr32
 
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+=              libmix
-endif
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBBLUETOOTH,libbluetooth,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBBLUETOOTH},${PKGSD_LIBBLUETOOTH},${PKGSC_LIBBLUETOOTH},${PKG_OPTS}))
 
+AUTOTOOL_STYLE:=	autoreconf
 ifeq ($(ADK_STATIC),y)
 XAKE_FLAGS+=		CCLD="$(TARGET_CC) -all-static -pthread"
 endif
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+TARGET_LDFLAGS+=	-lncurses
 CONFIGURE_ENV+=		ac_cv_prog_cc_pie=no
 CONFIGURE_ARGS+=	--enable-tools \
-			--enable-alsa \
-			--enable-usb \
-			--enable-bccmd \
-			--enable-hidd \
-			--enable-pand \
-			--enable-dund \
-			--enable-netlink \
+			--disable-udev \
+			--disable-systemd \
+			--disable-obex \
 			--disable-pie \
 			--disable-cups
 
@@ -52,16 +39,10 @@ bluez-install:
 	${INSTALL_DIR} $(IDIR_BLUEZ)/etc/dbus-1/system.d
 	${INSTALL_DIR} ${IDIR_BLUEZ}/usr/bin
 	${CP} ${WRKINST}/usr/bin/* ${IDIR_BLUEZ}/usr/bin
-	${INSTALL_DIR} ${IDIR_BLUEZ}/usr/sbin
-	${CP} ${WRKINST}/usr/sbin/* ${IDIR_BLUEZ}/usr/sbin
 	${INSTALL_DIR} ${IDIR_BLUEZ}/etc/bluetooth
 	$(INSTALL_DATA) ./files/main.conf \
 		${IDIR_BLUEZ}/etc/bluetooth
 	$(INSTALL_DATA) ./files/bluetooth.conf \
 		$(IDIR_BLUEZ)/etc/dbus-1/system.d
 
-libbluetooth-install:
-	${INSTALL_DIR} ${IDIR_LIBBLUETOOTH}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libbluetooth.so* ${IDIR_LIBBLUETOOTH}/usr/lib
-
 include ${TOPDIR}/mk/pkg-bottom.mk

package/bluez/patches/patch-Makefile_am

@@ -0,0 +1,10 @@
+--- bluez-5.12.orig/Makefile.am	2013-12-10 07:59:06.000000000 +0100
++++ bluez-5.12/Makefile.am	2013-12-21 20:18:52.000000000 +0100
+@@ -245,6 +245,7 @@ unit_tests += unit/test-sdp
+ 
+ unit_test_sdp_SOURCES = unit/test-sdp.c \
+ 				src/shared/util.h src/shared/util.c \
++				src/log.h src/log.c \
+ 				src/sdpd.h src/sdpd-database.c \
+ 				src/sdpd-service.c src/sdpd-request.c
+ unit_test_sdp_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@

package/bluez/patches/patch-Makefile_in

@@ -0,0 +1,11 @@
+--- bluez-5.12.orig/Makefile.in	2013-12-10 07:59:32.000000000 +0100
++++ bluez-5.12/Makefile.in	2013-12-21 20:02:59.000000000 +0100
+@@ -157,7 +157,7 @@ DIST_COMMON = README $(am__configure_dep
+ @ANDROID_TRUE@	android/bluetoothd android/haltest
+ @ANDROID_TRUE@am__append_30 = android/libhal-internal.la
+ @HID2HCI_TRUE@am__append_31 = $(rules_DATA)
+-TESTS = $(am__EXEEXT_8)
++TESTS = 
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \

package/bluez/patches/patch-plugins_wiimote_c

@@ -0,0 +1,10 @@
+--- bluez-5.12.orig/plugins/wiimote.c	2013-12-10 07:59:06.000000000 +0100
++++ bluez-5.12/plugins/wiimote.c	2013-12-21 19:29:22.000000000 +0100
+@@ -28,6 +28,7 @@
+ #include <stdbool.h>
+ 
+ #include <bluetooth/bluetooth.h>
++#include <fcntl.h>
+ #include <glib.h>
+ 
+ #include "plugin.h"

package/bluez/patches/patch-profiles_network_bnep_c

@@ -0,0 +1,10 @@
+--- bluez-5.12.orig/profiles/network/bnep.c	2013-12-10 07:59:06.000000000 +0100
++++ bluez-5.12/profiles/network/bnep.c	2013-12-21 19:31:52.000000000 +0100
+@@ -32,6 +32,7 @@
+ #include <sys/param.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
++#include <sys/types.h>
+ #include <sys/wait.h>
+ #include <net/if.h>
+ #include <linux/sockios.h>

package/bluez/patches/patch-tools_bccmd_c

@@ -1,6 +1,6 @@
---- bluez-4.92.orig/tools/bccmd.c	2010-11-30 15:50:48.000000000 +0100
-+++ bluez-4.92/tools/bccmd.c	2011-05-17 18:19:30.856601139 +0200
-@@ -1183,6 +1183,7 @@ int main(int argc, char *argv[])
+--- bluez-5.12.orig/tools/bccmd.c	2013-09-16 10:36:07.000000000 +0200
++++ bluez-5.12/tools/bccmd.c	2013-12-21 19:19:21.000000000 +0100
+@@ -1159,6 +1159,7 @@ int main(int argc, char *argv[])
  			case 115200: bcsp_rate = B115200; break;
  			case 230400: bcsp_rate = B230400; break;
  			case 460800: bcsp_rate = B460800; break;
@@ -8,7 +8,7 @@
  			case 500000: bcsp_rate = B500000; break;
  			case 576000: bcsp_rate = B576000; break;
  			case 921600: bcsp_rate = B921600; break;
-@@ -1202,6 +1203,7 @@ int main(int argc, char *argv[])
+@@ -1178,6 +1179,7 @@ int main(int argc, char *argv[])
  #ifdef B4000000
  			case 4000000: bcsp_rate = B4000000; break;
  #endif

package/bluez/patches/patch-tools_csr_usb_c

@@ -0,0 +1,10 @@
+--- bluez-5.12.orig/tools/csr_usb.c	2013-09-16 10:36:07.000000000 +0200
++++ bluez-5.12/tools/csr_usb.c	2013-12-21 19:22:48.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include <errno.h>
+ #include <ctype.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>

package/bluez/patches/patch-tools_hciattach_c

@@ -1,6 +1,6 @@
---- bluez-4.92.orig/tools/hciattach.c	2010-11-30 15:50:48.000000000 +0100
-+++ bluez-4.92/tools/hciattach.c	2011-05-17 18:18:20.776610031 +0200
-@@ -107,6 +107,7 @@ static int uart_speed(int s)
+--- bluez-5.12.orig/tools/hciattach.c	2012-12-24 18:46:55.000000000 +0100
++++ bluez-5.12/tools/hciattach.c	2013-12-21 19:19:21.000000000 +0100
+@@ -101,6 +101,7 @@ static int uart_speed(int s)
  		return B230400;
  	case 460800:
  		return B460800;
@@ -8,7 +8,7 @@
  	case 500000:
  		return B500000;
  	case 576000:
-@@ -137,6 +138,7 @@ static int uart_speed(int s)
+@@ -135,6 +136,7 @@ static int uart_speed(int s)
  	case 4000000:
  		return B4000000;
  #endif

package/bluez/patches/patch-tools_hciconfig_c

@@ -0,0 +1,10 @@
+--- bluez-5.12.orig/tools/hciconfig.c	2013-10-15 15:41:07.000000000 +0200
++++ bluez-5.12/tools/hciconfig.c	2013-12-21 19:26:45.000000000 +0100
+@@ -30,6 +30,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <ctype.h>
++#include <fcntl.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>

package/bluez/patches/patch-unit_test-sdp_c

@@ -0,0 +1,15 @@
+--- bluez-5.12.orig/unit/test-sdp.c	2013-10-15 15:41:07.000000000 +0200
++++ bluez-5.12/unit/test-sdp.c	2013-12-21 20:23:50.000000000 +0100
+@@ -128,12 +128,6 @@ static void sdp_debug(const char *str, v
+ 	g_print("%s%s\n", prefix, str);
+ }
+ 
+-void btd_debug(const char *format, ...);
+-
+-void btd_debug(const char *format, ...)
+-{
+-}
+-
+ static void context_quit(struct context *context)
+ {
+ 	g_main_loop_quit(context->main_loop);

package/bridge-utils/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bridge-utils
 PKG_VERSION:=		1.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		ec7b381160b340648dede58c31bb2238
 PKG_DESCR:=		Ethernet bridging tools
 PKG_SECTION:=		bridge

package/bridge-utils/patches/patch-brctl_brctl_c

@@ -0,0 +1,13 @@
+--- bridge-utils-1.5.orig/brctl/brctl.c	2011-03-29 02:52:54.000000000 +0200
++++ bridge-utils-1.5/brctl/brctl.c	2013-12-27 20:58:33.000000000 +0100
+@@ -19,8 +19,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <getopt.h>
++#include <sys/types.h>
+ 
+ #include "libbridge.h"
+ #include "config.h"

package/bridge-utils/patches/patch-brctl_brctl_cmd_c

@@ -0,0 +1,10 @@
+--- bridge-utils-1.5.orig/brctl/brctl_cmd.c	2011-03-29 02:52:54.000000000 +0200
++++ bridge-utils-1.5/brctl/brctl_cmd.c	2013-12-27 20:59:48.000000000 +0100
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+ #include <errno.h>
+ #include <asm/param.h>
+ #include "libbridge.h"

package/bridge-utils/patches/patch-brctl_brctl_disp_c

@@ -0,0 +1,10 @@
+--- bridge-utils-1.5.orig/brctl/brctl_disp.c	2011-03-29 02:52:54.000000000 +0200
++++ bridge-utils-1.5/brctl/brctl_disp.c	2013-12-27 21:00:22.000000000 +0100
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+ 
+ #include "libbridge.h"
+ #include "brctl.h"

package/bridge-utils/patches/patch-libbridge_libbridge_h

@@ -1,9 +1,10 @@
 --- bridge-utils-1.5.orig/libbridge/libbridge.h	2011-03-29 02:52:54.000000000 +0200
-+++ bridge-utils-1.5/libbridge/libbridge.h	2013-07-12 14:38:31.000000000 +0200
-@@ -20,6 +20,7 @@
++++ bridge-utils-1.5/libbridge/libbridge.h	2013-12-27 21:01:15.000000000 +0100
+@@ -20,6 +20,8 @@
  #define _LIBBRIDGE_H
  
  #include <sys/socket.h>
++#include <sys/types.h>
 +#include <netinet/in.h>
  #include <linux/if.h>
  #include <linux/if_bridge.h>

package/cfgfs/Makefile

@@ -15,7 +15,7 @@ PKG_CFLINE_CFGFS:=	select BUSYBOX_DIFF@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_MD5SUM@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_XARGS@
 PKG_CFLINE_CFGFS+=	select BUSYBOX_FEATURE_SORT_BIG@
-PKG_CFLINE_CFGFS+=	depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS
+PKG_CFLINE_CFGFS+=	depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS && !ADK_TARGET_ROOTFS_JFFS2 && !ADK_TARGET_ROOTFS_SQUASHFS
 PKG_DFLT_CFGFS:=	y if !(ADK_TOOLCHAIN_ONLY || ADK_TOOLCHAIN_ARCHIVE)
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}

package/comgt/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		comgt
 PKG_VERSION:=		0.32
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		db2452680c3d953631299e331daf49ef
 PKG_DESCR:=		3G/GPRS datacard control tool
 PKG_SECTION:=		utils

package/comgt/patches/patch-comgt_c

@@ -0,0 +1,47 @@
+--- comgt.0.32.orig/comgt.c	2006-10-20 16:49:46.000000000 +0200
++++ comgt.0.32/comgt.c	2013-12-28 19:40:28.000000000 +0100
+@@ -30,7 +30,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <signal.h>
+-#include <termio.h>
++#include <termios.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <string.h>
+@@ -81,7 +81,7 @@ char token[MAXTOKEN];   /* For gettoken(
+ char scriptfile[MAXPATH]; /* Script file name */
+ char scriptfilepath[MAXPATH]; /* temp storage for full path */
+ BOOL verbose=0; /* Log actions */
+-struct termio cons, stbuf, svbuf;  /* termios: svbuf=before, stbuf=while */
++struct termios cons, stbuf, svbuf;  /* termios: svbuf=before, stbuf=while */
+ int comfd=0; /* Communication file descriptor.  Defaults to stdin. */
+ char msg[STRINGL]; /* Massage messages here */
+ int preturn,returns[MAXGOSUBS];
+@@ -926,7 +926,7 @@ void setcom(void) {
+ }
+ 
+ void doset(void) {
+-  struct termio console;
++  struct termios console;
+   int a,b;
+   gettoken();
+   if(strcmp(token,"echo")==0) {
+@@ -1281,7 +1281,7 @@ void opengt(void) {
+   parity=stbuf.c_cflag & (PARENB | PARODD);
+   stbuf.c_iflag &= ~(IGNCR | ICRNL | IUCLC | INPCK | IXON | IXANY | IGNPAR );
+   stbuf.c_oflag &= ~(OPOST | OLCUC | OCRNL | ONLCR | ONLRET);
+-  stbuf.c_lflag &= ~(ICANON | XCASE | ECHO | ECHOE | ECHONL);
++  stbuf.c_lflag &= ~(ICANON | ECHO | ECHOE | ECHONL);
+   stbuf.c_lflag &= ~(ECHO | ECHOE);
+   stbuf.c_cc[VMIN] = 1;
+   stbuf.c_cc[VTIME] = 0;
+@@ -1336,7 +1336,7 @@ void opendevice(void) {
+   parity=stbuf.c_cflag & (PARENB | PARODD);
+   stbuf.c_iflag &= ~(IGNCR | ICRNL | IUCLC | INPCK | IXON | IXANY | IGNPAR );
+   stbuf.c_oflag &= ~(OPOST | OLCUC | OCRNL | ONLCR | ONLRET);
+-  stbuf.c_lflag &= ~(ICANON | XCASE | ECHO | ECHOE | ECHONL);
++  stbuf.c_lflag &= ~(ICANON | ECHO | ECHOE | ECHONL);
+   stbuf.c_lflag &= ~(ECHO | ECHOE);
+   stbuf.c_cc[VMIN] = 1;
+   stbuf.c_cc[VTIME] = 0;

package/conntrack-tools/Makefile

@@ -14,6 +14,7 @@ PKG_BUILDDEP:=		libtirpc libnetfilter_queue libnetfilter_conntrack libnetfilter_
 PKG_URL:=		http://conntrack-tools.netfilter.org/
 PKG_SITES:=		http://www.netfilter.org/projects/conntrack-tools/files/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 PKG_ARCH_DEPENDS:=	!avr32
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2

package/corosync/Makefile

@@ -16,6 +16,7 @@ PKG_SITES:=		http://corosync.org/download/
 
 PKG_CFLINE_COROSYNC:=	select ADK_KERNEL_IP_MULTICAST
 PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_ARCH_DEPENDS:=      x86 x86_64
 
 include $(TOPDIR)/mk/package.mk
 

package/cryptsetup/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cryptsetup
-PKG_VERSION:=		1.3.1
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		1f5b5a9d538e8a3c191fb7dd85b9b013
+PKG_VERSION:=		1.6.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		a7aeb549a543eeac433eadfb6bc67837
 PKG_DESCR:=		LUKS cryptsetup tools
 PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt

package/ctorrent/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ctorrent
 PKG_VERSION:=		dnh3.3.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		59b23dd05ff70791cd6449effa7fc3b6
 PKG_DESCR:=		console-based BitTorrent client
 PKG_SECTION:=		p2p

package/ctorrent/patches/patch-compat_c

@@ -0,0 +1,13 @@
+--- ctorrent-dnh3.3.2.orig/compat.c	2008-06-15 02:00:19.000000000 +0200
++++ ctorrent-dnh3.3.2/compat.c	2014-01-02 18:21:09.000000000 +0100
+@@ -67,8 +67,8 @@ int snprintf(char *str, size_t size, con
+ char *strnstr(const char *haystack, const char *needle, size_t haystacklen)
+ {
+   char *p;
+-  ssize_t plen;
+-  ssize_t len = strlen(needle);
++  size_t plen;
++  size_t len = strlen(needle);
+ 
+   if( *needle == '\0' )
+     return (char *)haystack;

package/cutter/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cutter
 PKG_VERSION:=		1.03
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		50093db9b64277643969ee75b83ebbd1
 PKG_DESCR:=		Abort TCP/IP connections routed over a firewall
 PKG_SECTION:=		firewall

package/cutter/patches/patch-cutter_c

@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- cutter-1.03.orig/cutter.c	2005-04-30 09:01:03.000000000 +0200
-+++ cutter-1.03/cutter.c	2011-08-24 18:49:58.830478484 +0200
++++ cutter-1.03/cutter.c	2013-12-24 12:14:44.000000000 +0100
 @@ -35,6 +35,10 @@
   * 		improvment.
   */
@@ -12,7 +12,17 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  #include <string.h>
  #include <stdio.h>
  #include <unistd.h>
-@@ -297,7 +301,7 @@ int send_rst(
+@@ -50,7 +54,9 @@
+ #include <linux/if_ether.h>
+ #include <fcntl.h>
+ #include <netpacket/packet.h>
++#if defined(__GLIBC__)
+ #include <net/ethernet.h>     /* the L2 protocols */
++#endif
+ #include <linux/sockios.h>
+ #include <sys/ioctl.h>
+ #include <netinet/in.h>
+@@ -297,7 +303,7 @@ int send_rst(
  	pheader.placeholder=0;
  	pheader.protocol=IPPROTO_TCP;
  	pheader.tcp_length=htons(TCPHDR);
@@ -21,7 +31,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	tpack.tcp.check=in_cksum((unsigned short *)&pheader,TCPHDR+12);
  
  	/*
-@@ -419,7 +423,7 @@ int send_rst(
+@@ -419,7 +425,7 @@ int send_rst(
  			pheader.placeholder=0;
  			pheader.protocol=IPPROTO_TCP;
  			pheader.tcp_length=htons(TCPHDR);

package/daq/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		daq
 PKG_VERSION:=		2.0.0
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		a00855a153647df76d47f1ea454f74ae
 PKG_DESCR:=		daq
 PKG_SECTION:=		libs
@@ -21,6 +21,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,DAQ,daq,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 AUTOTOOL_STYLE:=	autoreconf
+CONFIGURE_ARGS+=	--disable-ipfw-module
 
 daq-install:
 	$(INSTALL_DIR) $(IDIR_DAQ)/usr/lib/daq

package/davfs2/Makefile

@@ -4,15 +4,17 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		davfs2
-PKG_VERSION:=		1.4.6
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		c9e8aeb15daeba4b6283b40bb640e908
+PKG_VERSION:=		1.4.7
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c75f9d7d260e7364362b89beba2b3186
 PKG_DESCR:=		WebDAV filesystem
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		fuse-utils kmod-fuse-fs neon
 PKG_BUILDDEP:=		libiconv-tiny neon fuse
 PKG_URL:=		http://savannah.nongnu.org/projects/davfs2/
-PKG_SITES:=		http://www.very-clever.com/download/nongnu/davfs2/
+PKG_SITES:=		http://download.savannah.gnu.org/releases/davfs2/
+
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/davfs2/patches/patch-src_cache_c

@@ -1,6 +1,14 @@
---- davfs2-1.4.6.orig/src/cache.c	2009-11-15 11:15:17.000000000 +0100
-+++ davfs2-1.4.6/src/cache.c	2010-12-27 22:02:47.000000000 +0100
-@@ -55,7 +55,6 @@
+--- davfs2-1.4.7.orig/src/cache.c	2012-07-19 13:26:00.000000000 +0200
++++ davfs2-1.4.7/src/cache.c	2014-01-01 20:01:21.000000000 +0100
+@@ -24,7 +24,6 @@
+ #include <dirent.h>
+ #endif
+ #include <errno.h>
+-#include <error.h>
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif
+@@ -55,7 +54,6 @@
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif

package/davfs2/patches/patch-src_coda_h

@@ -0,0 +1,15 @@
+--- davfs2-1.4.7.orig/src/coda.h	2009-04-14 21:54:57.000000000 +0200
++++ davfs2-1.4.7/src/coda.h	2014-01-01 20:12:52.000000000 +0100
+@@ -57,6 +57,12 @@ typedef int		     int32_t;
+ typedef unsigned int	   u_int32_t;
+ #endif
+ 
++typedef unsigned long u_long;
++typedef unsigned int u_int;
++typedef unsigned short u_short;
++typedef unsigned long long u_quad_t;
++#include <sys/types.h>
++
+ 
+ /*
+  * Cfs constants

package/davfs2/patches/patch-src_dav_fuse_c

@@ -1,10 +1,11 @@
---- davfs2-1.4.6.orig/src/dav_fuse.c	2010-02-16 20:29:49.000000000 +0100
-+++ davfs2-1.4.6/src/dav_fuse.c	2010-12-27 22:02:24.000000000 +0100
-@@ -33,6 +33,7 @@
- #ifdef HAVE_STDINT_H
- #include <stdint.h>
+--- davfs2-1.4.7.orig/src/dav_fuse.c	2012-07-19 13:18:51.000000000 +0200
++++ davfs2-1.4.7/src/dav_fuse.c	2014-01-01 20:02:55.000000000 +0100
+@@ -48,6 +48,8 @@
+ #include <sys/stat.h>
  #endif
-+#include <stdlib.h>
- #include <string.h>
- #ifdef HAVE_SYSLOG_H
- #include <syslog.h>
+ 
++#include <sys/select.h>
++
+ #include "defaults.h"
+ #include "mount_davfs.h"
+ #include "cache.h"

package/davfs2/patches/patch-src_kernel_interface_c

@@ -0,0 +1,10 @@
+--- davfs2-1.4.7.orig/src/kernel_interface.c	2012-07-19 12:58:48.000000000 +0200
++++ davfs2-1.4.7/src/kernel_interface.c	2014-01-01 20:01:11.000000000 +0100
+@@ -20,7 +20,6 @@
+ 
+ #include "config.h"
+ 
+-#include <error.h>
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif

package/davfs2/patches/patch-src_mount_davfs_c

@@ -1,6 +1,16 @@
---- davfs2-1.4.6.orig/src/mount_davfs.c	2010-01-21 19:50:15.000000000 +0100
-+++ davfs2-1.4.6/src/mount_davfs.c	2010-05-29 21:10:23.041613426 +0200
-@@ -29,7 +29,6 @@
+--- davfs2-1.4.7.orig/src/mount_davfs.c	2012-07-19 13:35:11.000000000 +0200
++++ davfs2-1.4.7/src/mount_davfs.c	2014-01-01 20:14:21.000000000 +0100
+@@ -20,16 +20,15 @@
+ 
+ #include "config.h"
+ 
++#include <paths.h>
+ #ifdef HAVE_ARGZ_H
+ #include <argz.h>
+ #endif
+ #include <ctype.h>
+ #include <errno.h>
+-#include <error.h>
  #ifdef HAVE_FCNTL_H
  #include <fcntl.h>
  #endif
@@ -8,15 +18,15 @@
  #include <getopt.h>
  #include <grp.h>
  #ifdef HAVE_LIBINTL_H
-@@ -677,6 +676,7 @@ check_double_mounts(dav_args *args)
+@@ -674,6 +673,7 @@ check_double_mounts(dav_args *args)
  static void
  check_fstab(const dav_args *args)
  {
 +#if 0
      dav_args *n_args = new_args();
      n_args->mopts = DAV_USER_MOPTS;
- 
-@@ -733,6 +733,7 @@ check_fstab(const dav_args *args)
+     setfsent();
+@@ -737,6 +737,7 @@ check_fstab(const dav_args *args)
  
      endfsent();
      delete_args(n_args);
@@ -24,7 +34,7 @@
  }
  
  
-@@ -754,7 +755,7 @@ check_mountpoint(dav_args *args)
+@@ -758,7 +759,7 @@ check_mountpoint(dav_args *args)
      struct passwd *pw;
  
      if (*mpoint != '/') {
@@ -33,7 +43,7 @@
          if (!mp)
              error(EXIT_FAILURE, 0,
                    _("can't evaluate path of mount point %s"), mpoint);
-@@ -1824,6 +1825,7 @@ new_args(void)
+@@ -1793,6 +1794,7 @@ new_args(void)
  static void
  log_dbg_cmdline(char *argv[])
  {
@@ -41,8 +51,8 @@
      size_t len;
      char *cmdline;
      if (argz_create(argv, &cmdline, &len) == 0) {
-@@ -1831,6 +1833,7 @@ log_dbg_cmdline(char *argv[])
-         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), cmdline);
+@@ -1800,6 +1802,7 @@ log_dbg_cmdline(char *argv[])
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "%s", cmdline);
          free(cmdline);
      }
 +    */

package/davfs2/patches/patch-src_webdav_c

@@ -1,6 +1,14 @@
---- davfs2-1.4.6.orig/src/webdav.c	2010-02-16 20:29:59.000000000 +0100
-+++ davfs2-1.4.6/src/webdav.c	2010-05-30 09:52:01.161613627 +0200
-@@ -52,6 +52,8 @@
+--- davfs2-1.4.7.orig/src/webdav.c	2012-07-19 13:27:51.000000000 +0200
++++ davfs2-1.4.7/src/webdav.c	2014-01-01 20:14:54.000000000 +0100
+@@ -21,7 +21,6 @@
+ #include "config.h"
+ 
+ #include <errno.h>
+-#include <error.h>
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif
+@@ -52,6 +51,8 @@
  #include <sys/stat.h>
  #endif
  
@@ -9,7 +17,7 @@
  #include <ne_alloc.h>
  #include <ne_auth.h>
  #include <ne_basic.h>
-@@ -1918,6 +1920,7 @@ quota_result(void *userdata, const ne_ur
+@@ -1921,6 +1922,7 @@ quota_result(void *userdata, const ne_ur
  static int
  ssl_verify(void *userdata, int failures, const ne_ssl_certificate *cert)
  {
@@ -17,7 +25,7 @@
      char *issuer = ne_ssl_readable_dname(ne_ssl_cert_issuer(cert));
      char *subject = ne_ssl_readable_dname(ne_ssl_cert_subject(cert));
      char *digest = ne_calloc(NE_SSL_DIGESTLEN);
-@@ -1964,8 +1967,13 @@ ssl_verify(void *userdata, int failures,
+@@ -1967,8 +1969,13 @@ ssl_verify(void *userdata, int failures,
              len = getline(&s, &n, stdin);
              if (len < 0)
                  abort();

package/dbus-python/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dbus-python
 PKG_VERSION:=		1.2.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		b09cd2d1a057cc432ce944de3fc06bf7
 PKG_DESCR:=		DBUS python bindings
 PKG_SECTION:=		libs

package/dbus-python/patches/patch-configure

@@ -0,0 +1,11 @@
+--- dbus-python-1.2.0.orig/configure	2013-05-08 09:48:42.000000000 +0200
++++ dbus-python-1.2.0/configure	2013-12-13 12:52:44.522656370 +0100
+@@ -11762,7 +11762,7 @@ $as_echo "$as_me: PYTHON_INCLUDES overri
+ else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python headers using $PYTHON-config --includes" >&5
+ $as_echo_n "checking for Python headers using $PYTHON-config --includes... " >&6; }
+-  PYTHON_INCLUDES=`$PYTHON-config --includes`
++  PYTHON_INCLUDES=`python-config --includes`
+   if test $? = 0; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_INCLUDES" >&5
+ $as_echo "$PYTHON_INCLUDES" >&6; }

package/deco/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		deco
 PKG_VERSION:=		39
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		f77f60e8be0cae1f814cba1ef61bf4d0
 PKG_DESCR:=		Text-based, full featured file manager
 PKG_SECTION:=		misc
@@ -20,6 +20,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DECO,deco,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+TARGET_LDFLAGS+=	-ltinfo
 INSTALL_STYLE:=		manual
 
 do-install:

package/dhcp-forwarder/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dhcp-forwarder
-PKG_VERSION:=		0.9
+PKG_VERSION:=		0.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		63630db269ac17523ad085b67277b1c3
+PKG_MD5SUM:=		97b5f3ddbdee5c1f6756321c15907138
 PKG_DESCR:=		DHCP relay agent
 PKG_SECTION:=		dhcp
 PKG_URL:=		http://www.nongnu.org/dhcp-fwd/

package/dhcp-forwarder/patches/patch-src_parser_c

@@ -0,0 +1,10 @@
+--- dhcp-forwarder-0.10.orig/src/parser.c	2012-04-30 12:57:35.000000000 +0200
++++ dhcp-forwarder-0.10/src/parser.c	2013-12-30 19:16:07.000000000 +0100
+@@ -27,6 +27,7 @@
+ #include <fcntl.h>
+ #include <netinet/in.h>
+ #include <sys/mman.h>
++#include <sys/stat.h>
+ 
+ #include "parser.h"
+ #include "cfg.h"

package/digitemp/Makefile

@@ -14,6 +14,7 @@ PKG_BUILDDEP:=		libusb libusb-compat
 PKG_URL:=		http://www.digitemp.com/software/linux/
 PKG_SITES:=		http://www.digitemp.com/software/linux/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 PKG_ARCH_DEPENDS:=	!avr32
 
 include ${TOPDIR}/mk/package.mk

package/dillo/Makefile

@@ -25,8 +25,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DILLO,dillo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		PNG_CONFIG=$(STAGING_DIR)/usr/bin/png-config
-TARGET_LDFLAGS+=	-liconv -lpng15
+CONFIGURE_ENV+=		PNG_CONFIG=$(STAGING_TARGET_DIR)/scripts/libpng-config
+TARGET_LDFLAGS+=	-liconv
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 CONFIGURE_ARGS+=	--enable-ssl
 

package/drbd/Makefile

@@ -4,14 +4,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		drbd
-PKG_VERSION:=		8.4.1
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		3af0cc49ee0b5005ea108c5ba92aa755
+PKG_VERSION:=		8.4.4
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		b51815343c1a9151e2936b3b97520388
 PKG_DESCR:=		DRBD admin tools
 PKG_SECTION:=		fs
 PKG_URL:=		http://www.drbd.org/
 PKG_SITES:=		http://oss.linbit.com/drbd/8.4/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DRBD,drbd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -31,7 +33,7 @@ post-install:
 	$(INSTALL_DIR) $(IDIR_DRBD)/usr/sbin
 	$(CP) $(WRKINST)/usr/lib/drbd/* \
 		$(IDIR_DRBD)/usr/lib/drbd/
-	$(INSTALL_BIN) $(WRKINST)/sbin/drbd* \
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/drbd* \
 		$(IDIR_DRBD)/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/drbd/patches/patch-drbd_drbd_buildtag_c

@@ -1,11 +0,0 @@
---- drbd-8.4.1.orig/drbd/drbd_buildtag.c	2011-12-20 12:43:15.000000000 +0100
-+++ drbd-8.4.1/drbd/drbd_buildtag.c	2012-07-24 23:03:27.000000000 +0200
-@@ -3,5 +3,5 @@
- const char *drbd_buildtag(void)
- {
- 	return "GIT-hash: 91b4c048c1a0e06777b5f65d312b38d47abaea80"
--		" build by phil@fat-tyre, 2011-12-20 12:43:15";
--}
-+		" build by wbx@neon, 2012-07-24 23:03:27";
-+}
-\ No newline at end of file

package/dropbear/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dropbear
 PKG_VERSION:=		2013.62
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		ca2c7932a1399cf361f795aaa3843998
 PKG_DESCR:=		SSH 2 server/client designed for embedded systems
 PKG_SECTION:=		net/security

package/dropbear/files/dropbear.init

@@ -31,6 +31,14 @@ start)
 			echo "dropbear: key generation exited with code $?"
 		fi
 	fi
+	if test ! -f /etc/dropbear/dropbear_ecdsa_host_key; then
+		# take it easy here, since above already catched the worst cases
+		if test -x /usr/bin/dropbearkey; then
+			echo "dropbear: generating SSH private key (ECDSA)"
+			/usr/bin/dropbearkey -f /etc/dropbear/dropbear_ecdsa_host_key -t ecdsa
+			echo "dropbear: key generation exited with code $?"
+		fi
+	fi
 	/usr/sbin/dropbear $dropbear_flags
 	;;
 stop)

package/dsniff/Makefile

@@ -15,6 +15,7 @@ PKG_URL:=		http://www.monkey.org/~dugsong/dsniff/
 PKG_SITES:=		http://www.monkey.org/~dugsong/dsniff/beta/
 
 PKG_ARCH_DEPENDS:=	!arm
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-2.4
 

package/esound/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		esound
 PKG_VERSION:=		0.2.41
-PKG_RELEASE:=		6
+PKG_RELEASE:=		8
 PKG_MD5SUM:=		3d8973ed87053d7acc1f4d44af2c4688
 PKG_DESCR:=		Enlightened Sound Daemon
 PKG_SECTION:=		multimedia

package/esound/patches/patch-esddsp_c

@@ -0,0 +1,38 @@
+--- esound-0.2.41.orig/esddsp.c	2008-11-18 21:35:19.000000000 +0100
++++ esound-0.2.41/esddsp.c	2013-12-23 16:08:43.000000000 +0100
+@@ -264,7 +264,7 @@ open_wrapper (int (*func) (const char *,
+ }
+ 
+ int
+-open (const char *pathname, int flags, ...)
++esd_open (const char *pathname, int flags, ...)
+ {
+   static int (*func) (const char *, int, mode_t) = NULL;
+   va_list args;
+@@ -291,7 +291,7 @@ open (const char *pathname, int flags, .
+ }
+ 
+ int
+-open64 (const char *pathname, int flags, ...)
++esd_open64 (const char *pathname, int flags, ...)
+ {
+   static int (*func) (const char *, int, mode_t) = NULL;
+   va_list args;
+@@ -355,7 +355,7 @@ fopen_wrapper (FILE * (*func) (const cha
+ }
+ 
+ FILE *
+-fopen (const char *path, const char *mode)
++esd_fopen (const char *path, const char *mode)
+ {
+   static FILE * (*func) (const char *, const char *) = NULL;
+ 
+@@ -375,7 +375,7 @@ fopen (const char *path, const char *mod
+ }
+ 
+ FILE *
+-fopen64 (const char *path, const char *mode)
++esd_fopen64 (const char *path, const char *mode)
+ {
+   static FILE * (*func) (const char *, const char *) = NULL;
+ 

package/ether-wake/Makefile

@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_DESCR:=		A Wake-On-LAN (WOL) client
 PKG_SECTION:=		net
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk

package/fbset/Makefile

@@ -11,6 +11,8 @@ PKG_DESCR:=		framebuffer utility
 PKG_SECTION:=		utils
 PKG_SITES:=		http://users.telenet.be/geertu/Linux/fbdev/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FBSET,fbset,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/firefox/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
-PKG_VERSION:=		24.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		06a4c0fe8d3a979aea2fce8d0fdbf328
+PKG_VERSION:=		26.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		91ce51cc6474f1269484e5327643a59c
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libpthread alsa-lib glib libgtk libpng libtiff libxcursor libffi

package/firefox/patches/patch-ipc_chromium_src_base_file_util_h

@@ -1,23 +1,10 @@
---- mozilla-release.orig/ipc/chromium/src/base/file_util.h	2013-09-11 01:15:04.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/base/file_util.h	2013-10-23 16:28:38.000000000 +0200
-@@ -16,7 +16,11 @@
+--- mozilla-release.orig/ipc/chromium/src/base/file_util.h	2013-12-05 17:07:35.000000000 +0100
++++ mozilla-release/ipc/chromium/src/base/file_util.h	2014-01-02 15:01:42.000000000 +0100
+@@ -16,7 +16,6 @@
  #include <sys/stat.h>
  #elif defined(OS_POSIX) 
  #include <sys/types.h>
-+#ifndef __GLIBC__
-+#define NO_FTS
-+#else
- #include <fts.h>
-+#endif
+-#include <fts.h>
  #include <sys/stat.h>
  #endif
  
-@@ -466,7 +470,7 @@ class FileEnumerator {
- #if defined(OS_WIN)
-   WIN32_FIND_DATA find_data_;
-   HANDLE find_handle_;
--#elif defined(ANDROID)
-+#elif defined(NO_FTS)
-   void *fts_;
- #elif defined(OS_POSIX)
-   FTS* fts_;

package/firefox/patches/patch-ipc_chromium_src_base_file_util_posix_cc

@@ -1,5 +1,5 @@
---- mozilla-release.orig/ipc/chromium/src/base/file_util_posix.cc	2013-09-11 01:15:04.000000000 +0200
-+++ mozilla-release/ipc/chromium/src/base/file_util_posix.cc	2013-10-23 16:28:38.000000000 +0200
+--- mozilla-release.orig/ipc/chromium/src/base/file_util_posix.cc	2013-12-05 17:07:35.000000000 +0100
++++ mozilla-release/ipc/chromium/src/base/file_util_posix.cc	2014-01-02 14:53:44.000000000 +0100
 @@ -8,13 +8,16 @@
  #include <errno.h>
  #include <fcntl.h>
@@ -19,7 +19,7 @@
  #include <sys/mman.h>
  #define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures
  #include <sys/stat.h>
-@@ -121,7 +124,7 @@ bool Delete(const FilePath& path, bool r
+@@ -67,7 +70,7 @@ bool Delete(const FilePath& path, bool r
    if (!recursive)
      return (rmdir(path_str) == 0);
  
@@ -28,7 +28,7 @@
    // XXX Need ftsless impl for bionic
    return false;
  #else
-@@ -194,7 +197,7 @@ bool CopyDirectory(const FilePath& from_
+@@ -140,7 +143,7 @@ bool CopyDirectory(const FilePath& from_
      return false;
    }
  
@@ -37,7 +37,7 @@
    // XXX Need ftsless impl for bionic
    return false;
  #else
-@@ -415,7 +418,7 @@ bool CreateNewTempDirectory(const FilePa
+@@ -333,7 +336,7 @@ bool CreateNewTempDirectory(const FilePa
      return false;
    tmpdir = tmpdir.Append(kTempFileName);
    std::string tmpdir_string = tmpdir.value();
@@ -46,30 +46,3 @@
    char* dtemp = NULL;
  #else
    // this should be OK since mkdtemp just replaces characters in place
-@@ -613,7 +616,7 @@ FileEnumerator::FileEnumerator(const Fil
- }
- 
- FileEnumerator::~FileEnumerator() {
--#ifndef ANDROID
-+#ifndef NO_FTS
-   if (fts_)
-     fts_close(fts_);
- #endif
-@@ -625,7 +628,7 @@ void FileEnumerator::GetFindInfo(FindInf
-   if (!is_in_find_op_)
-     return;
- 
--#ifndef ANDROID
-+#ifndef NO_FTS
-   memcpy(&(info->stat), fts_ent_->fts_statp, sizeof(info->stat));
-   info->filename.assign(fts_ent_->fts_name);
- #endif
-@@ -636,7 +639,7 @@ void FileEnumerator::GetFindInfo(FindInf
- // large directories with many files this can be quite deep.
- // TODO(erikkay) - get rid of this recursive pattern
- FilePath FileEnumerator::Next() {
--#ifdef ANDROID
-+#ifdef NO_FTS
-   return FilePath();
- #else
-   if (!is_in_find_op_) {

package/firefox/patches/patch-js_src_Makefile_in

@@ -1,6 +1,6 @@
---- mozilla-release.orig/js/src/Makefile.in	2013-09-11 01:15:04.000000000 +0200
-+++ mozilla-release/js/src/Makefile.in	2013-10-14 12:36:25.000000000 +0200
-@@ -112,7 +112,7 @@ ifdef JS_HAS_CTYPES
+--- mozilla-release.orig/js/src/Makefile.in	2013-12-05 17:07:35.000000000 +0100
++++ mozilla-release/js/src/Makefile.in	2014-01-02 14:53:44.000000000 +0100
+@@ -103,7 +103,7 @@ ifdef JS_HAS_CTYPES
  VPATH += $(srcdir)/ctypes
  
  ifdef MOZ_NATIVE_FFI

package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c

@@ -1,11 +1,33 @@
---- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-09-11 01:15:16.000000000 +0200
-+++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-12-10 13:18:17.000000000 +0100
-@@ -59,7 +59,7 @@ static char *RCSSTRING __UNUSED__="$Id:
+--- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/addrs.c	2013-12-05 17:07:48.000000000 +0100
++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c	2014-01-03 13:06:22.000000000 +0100
+@@ -53,7 +53,9 @@ static char *RCSSTRING __UNUSED__="$Id:
+ #undef __unused
+ #include <linux/sysctl.h>
+ #endif
++#if defined(__GLIBC__)
+ #include <net/if.h>
++#endif
+ #ifndef LINUX
+ #if !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #include <net/if_var.h>
+@@ -61,14 +63,17 @@ static char *RCSSTRING __UNUSED__="$Id:
  #include <net/if_dl.h>
  #include <net/if_types.h>
  #include <sys/sockio.h>
 -#else
-+#elif __GLIBC__
++#elif defined(__GLIBC__)
+ #include <linux/sockios.h>
  #include <linux/if.h>
+ #include <linux/kernel.h>
+ #include <linux/wireless.h>
+-#ifndef ANDROID
+ #include <linux/ethtool.h>
+-#endif
++#else
++#include <linux/sockios.h>
++#include <linux/kernel.h>
++#include <linux/wireless.h>
++#include <linux/ethtool.h>
  #endif
  #include <net/route.h>
+ 

package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_stun_h

@@ -0,0 +1,12 @@
+--- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/stun.h	2013-12-05 17:07:48.000000000 +0100
++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/stun.h	2014-01-03 17:19:05.000000000 +0100
+@@ -39,7 +39,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ #else
+ #include <sys/param.h>
+ #include <sys/socket.h>
++#if defined(__GLIBC__)
+ #include <net/if.h>
++#endif
+ #ifndef LINUX
+ #if !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #include <net/if_var.h>

package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_cpu_info_cc

@@ -1,23 +1,23 @@
---- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2013-09-11 01:15:18.000000000 +0200
-+++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2013-10-15 12:21:59.000000000 +0200
-@@ -38,11 +38,6 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCo
+--- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2013-12-05 17:07:50.000000000 +0100
++++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2014-01-02 14:58:37.000000000 +0100
+@@ -36,11 +36,6 @@ uint32_t CpuInfo::DetectNumberOfCores()
      WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
                   "Available number of cores:%d", number_of_cores_);
  
 -#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK)
--    number_of_cores_ = get_nprocs();
+-    number_of_cores_ = static_cast<uint32_t>(sysconf(_SC_NPROCESSORS_ONLN));
 -    WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
 -                 "Available number of cores:%d", number_of_cores_);
 -
  #elif defined(WEBRTC_BSD) || defined(WEBRTC_MAC)
      int name[] = {
        CTL_HW,
-@@ -63,8 +58,6 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCo
+@@ -61,8 +56,6 @@ uint32_t CpuInfo::DetectNumberOfCores()
                     "Failed to get number of cores");
        number_of_cores_ = 1;
      }
 -#elif defined(_SC_NPROCESSORS_ONLN)
--    _numberOfCores = sysconf(_SC_NPROCESSORS_ONLN);
+-    number_of_cores_ = sysconf(_SC_NPROCESSORS_ONLN);
  #else
      WEBRTC_TRACE(kTraceWarning, kTraceUtility, -1,
                   "No function to get number of cores");

package/firefox/patches/patch-media_webrtc_trunk_webrtc_system_wrappers_source_spreadsortlib_spreadsort_hpp

@@ -1,8 +1,8 @@
---- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2013-09-11 01:15:18.000000000 +0200
-+++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2013-10-15 16:05:38.000000000 +0200
+--- mozilla-release.orig/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2013-12-05 17:07:50.000000000 +0100
++++ mozilla-release/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp	2014-01-02 14:53:44.000000000 +0100
 @@ -21,6 +21,11 @@ Scott McMurray
- #include "constants.hpp"
- #include <cstring>
+ #include <vector>
+ #include "webrtc/system_wrappers/source/spreadsortlib/constants.hpp"
  
 +#include <features.h>
 +#if defined(__UCLIBC__)

package/firefox/patches/patch-python_mozbuild_mozbuild_backend_recursivemake_py

@@ -0,0 +1,11 @@
+--- mozilla-release.orig/python/mozbuild/mozbuild/backend/recursivemake.py	2013-12-05 17:07:53.000000000 +0100
++++ mozilla-release/python/mozbuild/mozbuild/backend/recursivemake.py	2014-01-04 17:58:26.000000000 +0100
+@@ -421,7 +421,7 @@ class RecursiveMakeBackend(CommonBackend
+     def _handle_idl_manager(self, manager):
+         build_files = self._purge_manifests['xpidl']
+ 
+-        for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done',
++        for p in ('Makefile.in', 'Makefile', 'backend.mk', '.deps/.mkdir.done',
+             'xpt/.mkdir.done'):
+             build_files.add(p)
+ 

package/firefox/patches/patch-tools_profiler_platform-linux_cc

@@ -1,15 +1,15 @@
---- mozilla-release.orig/tools/profiler/platform-linux.cc	2013-09-11 01:15:26.000000000 +0200
-+++ mozilla-release/tools/profiler/platform-linux.cc	2013-10-23 16:28:38.000000000 +0200
-@@ -53,7 +53,7 @@
- #include <sys/stat.h>   // open
+--- mozilla-release.orig/tools/profiler/platform-linux.cc	2013-12-05 17:07:58.000000000 +0100
++++ mozilla-release/tools/profiler/platform-linux.cc	2014-01-02 14:59:20.000000000 +0100
+@@ -58,7 +58,7 @@
  #include <fcntl.h>      // open
  #include <unistd.h>     // sysconf
+ #include <semaphore.h>
 -#ifdef __GLIBC__
 +#if defined(__GLIBC__) && ! defined(__UCLIBC__)
  #include <execinfo.h>   // backtrace, backtrace_symbols
  #endif  // def __GLIBC__
  #include <strings.h>    // index
-@@ -73,14 +73,12 @@
+@@ -84,14 +84,12 @@
  
  #define SIGNAL_SAVE_PROFILE SIGUSR2
  

package/firefox/patches/patch-tools_profiler_shared-libraries-linux_cc

@@ -1,11 +1,11 @@
---- mozilla-release.orig/tools/profiler/shared-libraries-linux.cc	2013-09-11 01:15:26.000000000 +0200
-+++ mozilla-release/tools/profiler/shared-libraries-linux.cc	2013-10-23 16:28:38.000000000 +0200
+--- mozilla-release.orig/tools/profiler/shared-libraries-linux.cc	2013-12-05 17:07:58.000000000 +0100
++++ mozilla-release/tools/profiler/shared-libraries-linux.cc	2014-01-02 15:00:00.000000000 +0100
 @@ -14,7 +14,7 @@
  #include "platform.h"
  #include "shared-libraries.h"
  
--#ifndef __GLIBC__
+-#if !defined(__GLIBC__) && ANDROID_VERSION < 18
 +#if 0
- /* a crapy version of getline, because it's not included in bionic */
+ /* a crapy version of getline, because it's not included in old bionics */
  static ssize_t getline(char **lineptr, size_t *n, FILE *stream)
  {

package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp

@@ -1,6 +1,6 @@
---- mozilla-release.orig/xpcom/io/nsLocalFileUnix.cpp	2013-09-11 01:15:27.000000000 +0200
-+++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp	2013-10-14 14:33:08.000000000 +0200
-@@ -1256,8 +1256,13 @@ nsLocalFile::GetDiskSpaceAvailable(int64
+--- mozilla-release.orig/xpcom/io/nsLocalFileUnix.cpp	2013-12-05 17:08:00.000000000 +0100
++++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp	2014-01-02 14:53:47.000000000 +0100
+@@ -1234,8 +1234,13 @@ nsLocalFile::GetDiskSpaceAvailable(int64
         && dq.dqb_bhardlimit)
      {
          int64_t QuotaSpaceAvailable = 0;

package/firefox/patches/patch-xpcom_threads_nsThread_cpp

@@ -1,6 +1,6 @@
---- mozilla-release.orig/xpcom/threads/nsThread.cpp	2013-09-11 01:15:27.000000000 +0200
-+++ mozilla-release/xpcom/threads/nsThread.cpp	2013-10-14 15:49:25.000000000 +0200
-@@ -20,11 +20,13 @@
+--- mozilla-release.orig/xpcom/threads/nsThread.cpp	2013-12-05 17:08:00.000000000 +0100
++++ mozilla-release/xpcom/threads/nsThread.cpp	2014-01-02 14:53:47.000000000 +0100
+@@ -23,11 +23,13 @@
                        _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) &&           \
                        !(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
  

package/fuse/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		fuse
 PKG_VERSION:=		2.9.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		33cae22ca50311446400daf8a6255c6a
 PKG_DESCR:=		Filesystem in Userspace (utilities)
 PKG_SECTION:=		fs

package/fuse/patches/patch-lib_fuse_c

@@ -0,0 +1,10 @@
+--- fuse-2.9.3.orig/lib/fuse.c	2013-07-01 09:40:39.000000000 +0200
++++ fuse-2.9.3/lib/fuse.c	2014-01-01 11:45:54.000000000 +0100
+@@ -33,6 +33,7 @@
+ #include <dlfcn.h>
+ #include <assert.h>
+ #include <poll.h>
++#include <sys/file.h>
+ #include <sys/param.h>
+ #include <sys/uio.h>
+ #include <sys/time.h>

package/fuse/patches/patch-lib_fuse_lowlevel_c

@@ -0,0 +1,10 @@
+--- fuse-2.9.3.orig/lib/fuse_lowlevel.c	2013-07-01 09:40:39.000000000 +0200
++++ fuse-2.9.3/lib/fuse_lowlevel.c	2014-01-01 11:50:38.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <limits.h>
+ #include <errno.h>
+ #include <assert.h>
++#include <sys/file.h>
+ 
+ #ifndef F_LINUX_SPECIFIC_BASE
+ #define F_LINUX_SPECIFIC_BASE       1024

package/fuse/patches/patch-lib_mount_util_c

@@ -0,0 +1,10 @@
+--- fuse-2.9.3.orig/lib/mount_util.c	2013-07-01 09:25:36.000000000 +0200
++++ fuse-2.9.3/lib/mount_util.c	2014-01-01 11:52:48.000000000 +0100
+@@ -16,6 +16,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <limits.h>
++#include <paths.h>
+ #ifndef __NetBSD__
+ #include <mntent.h>
+ #endif

package/fuse/patches/patch-util_mount_util_c

@@ -0,0 +1,10 @@
+--- fuse-2.9.3.orig/util/mount_util.c	2013-07-01 10:02:18.000000000 +0200
++++ fuse-2.9.3/util/mount_util.c	2014-01-01 11:54:07.000000000 +0100
+@@ -16,6 +16,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <limits.h>
++#include <paths.h>
+ #ifndef __NetBSD__
+ #include <mntent.h>
+ #endif

package/gcc/Makefile

@@ -8,7 +8,7 @@ PKG_NAME:=		gcc
 PKG_DESCR:=		GNU C compiler
 PKG_SECTION:=		lang
 PKG_OPTS:=		noremove
-PKG_DEPENDS:=		libmpc libgmp mpfr
+PKG_DEPENDS:=		libmpc libgmp mpfr libgcc
 PKG_BUILDDEP:=		libmpc gmp mpfr
 
 PKG_ARCH_DEPENDS:=	!avr32
@@ -37,6 +37,12 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS64EL),y)
 CONFIGURE_ARGS+=       --with-abi=$(ADK_TARGET_ABI)
 endif
 
+ifeq ($(ADK_TOOLCHAIN_GCC_SJLJ),y)
+CONFIGURE_ARGS+=	--enable-sjlj-exceptions
+else
+CONFIGURE_ARGS+=	--disable-sjlj-exceptions
+endif
+
 ifneq ($(ADK_PACKAGE_GXX),)
 CONFIGURE_ARGS+=	--enable-languages=c,c++
 else
@@ -50,7 +56,6 @@ CONFIGURE_ARGS+=	--host=$(REAL_GNU_TARGET_NAME) \
 			--without-headers \
 			--libexecdir=/usr/lib \
 			--disable-libssp \
-			--disable-sjlj-exceptions \
 			--disable-biarch \
 			--disable-libmudflap \
 			--disable-libgomp \

package/gcc/patches/4.8.2/patch-libatomic_Makefile_in

@@ -0,0 +1,12 @@
+--- gcc-4.8.2.orig/libatomic/Makefile.in	2013-10-16 09:27:58.000000000 +0200
++++ gcc-4.8.2/libatomic/Makefile.in	2014-01-01 11:37:38.000000000 +0100
+@@ -298,7 +298,8 @@ PAT_N = $(word 2,$(PAT_SPLIT))
+ PAT_S = $(word 3,$(PAT_SPLIT))
+ IFUNC_DEF = -DIFUNC_ALT=$(PAT_S)
+ IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS))
+-M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
++@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
++@AMDEP_FALSE@M_DEPS = 
+ M_SIZE = -DN=$(PAT_N)
+ M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
+ M_FILE = $(PAT_BASE)_n.c