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

Config.in

@@ -152,7 +152,6 @@ config ADK_KERNEL_COMP_XZ
 	select ADK_KERNEL_RD_XZ
 	select ADK_KERNEL_KERNEL_XZ
 	select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ
-	depends on !ADK_LINUX_MIPS
 
 config ADK_KERNEL_COMP_LZMA
 	prompt "use LZMA compression"

Makefile

@@ -104,6 +104,9 @@ cleantarget targetclean: .prereq_done
 	-@${GMAKE_INV} cleantarget
 	@-rm -f make.log
 
+cleantoolchain toolchainclean: .prereq_done
+	-@${GMAKE_INV} cleantoolchain
+
 distclean cleandist:
 	-@${GMAKE_INV} distclean
 	@-rm -f make.log .prereq_done
@@ -146,6 +149,9 @@ allmodconfig: .prereq_done
 package_index: .prereq_done
 	@${GMAKE_INV} package_index
 
+test-framework: .prereq_done
+	@${GMAKE_INV} test-framework
+
 release: .prereq_done
 	@${GMAKE_INV} release
 

TODO

@@ -1,7 +1,13 @@
+- port uuterm
 - move tools to package host infrastructure, resolve dependency handling for host tools
+- finish miniconfig + cleanup
+- qemu-sh serial
+- choice qemu with graphic
+- x32 musl
+- socat openssl flavour + update
+- hash-style=gnu for non-mips and non-musl
 - add misp64 n32/n64 toolchains
 - hash-style=gnu for non-mips and non-musl
-- socat openssl flavour + update
 - add fb full screen logo
 - port opkg with gpg signing
 - restart network (kill wpa_supplicant)

mk/build.mk

@@ -104,7 +104,7 @@ POSTCONFIG=		-@\
 			fi; \
 		done; \
 		if [ "$$(grep ^ADK_RUNTIME_TIMEZONE .config|md5sum)" != "$$(grep ^ADK_RUNTIME_TIMEZONE .config.old|md5sum)" ];then \
-			touch .rebuild.eglibc .rebuild.uclibc .rebuild.glibc;\
+			touch .rebuild.musl .rebuild.uclibc .rebuild.glibc;\
 			rebuild=1;\
 		fi; \
 		if [ "$$(grep ^ADK_RUNTIME_SSH_PUBKEY .config|md5sum)" != "$$(grep ^ADK_RUNTIME_SSH_PUBKEY .config.old|md5sum)" ];then \
@@ -141,7 +141,7 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
 	$(STAGING_HOST_DIR)/usr/bin/depmaker > ${TOPDIR}/package/Depends.mk
 
 .NOTPARALLEL:
-.PHONY: all world clean cleantarget cleandir distclean image_clean
+.PHONY: all world clean cleantarget cleandir cleantoolchain distclean image_clean
 
 world:
 	mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
@@ -252,10 +252,8 @@ clean:
 	$(MAKE) -C $(CONFIG) clean
 	for f in $$(ls ${STAGING_PKG_DIR}/ 2>/dev/null |grep -v [A-Z]|grep -v stamps 2>/dev/null); do  \
 		while read file ; do \
-			echo ${STAGING_DIR}/$$file ;\
 			rm ${STAGING_DIR}/$$file 2>/dev/null;\
-		done < $$f ; \
-		echo ${STAGING_PKG_DIR}/$$f ;\
+		done < ${STAGING_PKG_DIR}/$$f ; \
 		rm ${STAGING_PKG_DIR}/$$f ; \
 	done
 	rm -rf $(BUILD_DIR) $(FW_DIR) $(TARGET_DIR) \
@@ -275,6 +273,15 @@ cleandir:
 	rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
 	rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk
 
+cleantoolchain:
+	@$(TRACE) cleantoolchain
+	@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) 
+	rm -rf $(BUILD_DIR_PFX) $(TARGET_DIR_PFX) \
+	    ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
+	rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
+	rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
+	rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk
+
 cleantarget:
 	@$(TRACE) cleantarget
 	@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
@@ -526,7 +533,7 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 
 # build all target architecture and libc combinations (toolchain only)
 bulktoolchain:
-	for libc in glibc eglibc uclibc musl;do \
+	for libc in glibc uclibc musl;do \
 		while read arch; do \
 		    mkdir -p $(TOPDIR)/firmware/toolchain_$${arch}_$$libc; \
 		    ( \
@@ -535,7 +542,8 @@ bulktoolchain:
 			$(GMAKE) prereq && \
 				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
 				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
-				tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_$${arch}_*_$${libc} target_$${arch}_*_$${libc}; \
+				tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_* target_$${arch}_$${libc}_*; \
+				$(GMAKE) cleantoolchain; \
 			rm .config; \
 		    ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}/build.log; \
 		    if [ -f .exit ];then break;fi \
@@ -543,8 +551,24 @@ bulktoolchain:
 		if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \
 	done
 
+test-framework:
+	for libc in uclibc glibc musl;do \
+		mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \
+		( \
+			for arch in arm mips mipsel x86 x86_64;do \
+				echo === building qemu-$$arch for $$libc on $$(date); \
+				$(GMAKE) prereq && \
+				$(GMAKE) ARCH=$$arch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive defconfig; \
+				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
+				rm .config; \
+			done; \
+		) 2>&1 | tee $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc/build.log; \
+		if [ -f .exit ];then echo "Bulk build failed!"; break;fi \
+	done
+	if [ -f .exit ];then rm .exit;exit 1;fi
+
 release:
-	for libc in uclibc eglibc glibc musl;do \
+	for libc in uclibc glibc musl;do \
 		mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \
 		( \
 			echo === building $$libc on $$(date); \
@@ -559,7 +583,7 @@ release:
 
 # build all target architecture, target systems and libc combinations
 bulk:
-	for libc in uclibc eglibc glibc musl;do \
+	for libc in uclibc glibc musl;do \
 	  while read arch; do \
 	      systems=$$(./scripts/getsystems $$arch|grep -v toolchain); \
 	      for system in $$systems;do \
@@ -579,7 +603,7 @@ bulk:
 	done
 
 bulkall:
-	for libc in uclibc eglibc glibc musl;do \
+	for libc in uclibc glibc musl;do \
 	  while read arch; do \
 	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \
 	      for system in $$systems;do \
@@ -599,7 +623,7 @@ bulkall:
 	done
 
 bulkallmod:
-	for libc in uclibc eglibc glibc musl;do \
+	for libc in uclibc glibc musl;do \
 	  while read arch; do \
 	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \
 	      for system in $$systems;do \

mk/image.mk

@@ -51,6 +51,7 @@ image-prepare-post:
 	-rm -f ${TARGET_DIR}/bin/sh
 	ln -sf ${BINSH} ${TARGET_DIR}/bin/sh
 ifeq ($(ADK_LINUX_X86_64),y)
+ifneq ($(ADK_TARGET_ABI_X32),y)
 	# fixup lib dirs
 	mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/lib/
@@ -60,6 +61,7 @@ ifeq ($(ADK_LINUX_X86_64),y)
 	rm -rf ${TARGET_DIR}/usr/lib/
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 endif
+endif
 ifeq ($(ADK_LINUX_PPC64),y)
 	# fixup lib dirs
 	mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
@@ -175,10 +177,11 @@ createinitramfs: ${FW_DIR}/${INITRAMFS}_list
 		${LINUX_DIR}/.config
 	( \
 		echo "CONFIG_BLK_DEV_INITRD=y"; \
+		echo "CONFIG_ACPI_INITRD_TABLE_OVERRIDE=n"; \
 		echo 'CONFIG_INITRAMFS_SOURCE="${FW_DIR}/${INITRAMFS}_list"'; \
-		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; \
+		echo '# CONFIG_INITRAMFS_COMPRESSION_NONE is not set'; \
+		echo 'CONFIG_INITRAMFS_ROOT_UID=0'; \
+		echo 'CONFIG_INITRAMFS_ROOT_GID=0'; \
 	) >> ${LINUX_DIR}/.config
 ifeq ($(ADK_KERNEL_COMP_XZ),y)
 		echo "CONFIG_RD_BZIP2=n" >> ${LINUX_DIR}/.config

mk/package.mk

@@ -112,7 +112,7 @@ build-all-pkgs: ${_IPKGS_COOKIE}
 #     noscripts -> do not install scripts to $(STAGING_TARGET_DIR)/scripts
 #		  (needed for example for autoconf/automake)
 #     noremove -> do not remove files from $(STAGING_TARGET_DIR)/target while
-#                 cleaning (needed for toolchain packages like glibc/eglibc)
+#                 cleaning (needed for toolchain packages like glibc)
 #     dev -> create a development subpackage with headers and pkg-config files
 # should be package format independent and modular in the future
 define PKG_template
@@ -242,7 +242,7 @@ endif
 		    'ramdisk location:' >&2; \
 		echo "$$$$x" | sed 's/^/- /' >&2; \
 	    fi; \
-	    if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "eglibc" -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}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" ];then \
 	    find lib \( -name lib\*.so\* -o -name lib\*.a \) \
 	    	-exec echo 'WARNING: $${IPKG_$(1)} installs files in /lib -' \
 		' fix this!' >&2 \; -quit 2>/dev/null; fi; \
@@ -300,7 +300,6 @@ $$(INFO_$(1)_DBG): $$(IPKG_$(1)_DBG)
 	$(PKG_INSTALL) $$(IPKG_$(1)_DBG)
 
 ifneq ($(1),UCLIBC)
-ifneq ($(1),EGLIBC)
 ifneq ($(1),GLIBC)
 ifneq ($(1),MUSL)
 $$(INFO_$(1)_DEV): $$(IPKG_$(1)_DEV)
@@ -308,7 +307,6 @@ $$(INFO_$(1)_DEV): $$(IPKG_$(1)_DEV)
 endif
 endif
 endif
-endif
 
 endef
 

mk/pkg-bottom.mk

@@ -184,7 +184,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" -a "${PKG_NAME}" != "pam" ];then \
+	    if [ "${PKG_NAME}" != "uClibc" -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/vars.mk

@@ -48,8 +48,13 @@ TARGET_DIR_PFX:=	$(BASE_DIR)/root_*
 TARGET_PATH=		${SCRIPT_DIR}:${STAGING_TARGET_DIR}/scripts:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
 HOST_PATH=		${SCRIPT_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
 AUTOTOOL_PATH=		${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH}
+ifeq ($(ADK_TARGET_ABI_X32),y)
+REAL_GNU_TARGET_NAME=	$(CPU_ARCH)-x32-linux-$(ADK_TARGET_SUFFIX)
+GNU_TARGET_NAME=	$(CPU_ARCH)-x32-linux
+else
 REAL_GNU_TARGET_NAME=	$(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX)
 GNU_TARGET_NAME=	$(CPU_ARCH)-$(ADK_VENDOR)-linux
+endif
 
 ifeq ($(ADK_DISABLE_HONOUR_CFLAGS),)
 GCC_CHECK:=		GCC_HONOUR_COPTS=2

package/Makefile

@@ -9,10 +9,6 @@ ifeq (${ADK_TARGET_LIB_GLIBC},y)
 package-$(ADK_PACKAGE_GLIBC) += glibc
 gcc-compile: glibc-compile
 endif
-ifeq (${ADK_TARGET_LIB_EGLIBC},y)
-package-$(ADK_PACKAGE_EGLIBC) += eglibc
-gcc-compile: eglibc-compile
-endif
 ifeq (${ADK_TARGET_LIB_MUSL},y)
 package-$(ADK_PACKAGE_MUSL) += musl
 gcc-compile: musl-compile
@@ -25,7 +21,6 @@ package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread
 endif
 
 ifneq (${ADK_TARGET_LIB_GLIBC},y)
-ifneq (${ADK_TARGET_LIB_EGLIBC},y)
 ifneq (${ADK_TARGET_LIB_MUSL},y)
 ifneq (${ADK_NATIVE},y)
 package-$(ADK_PACKAGE_UCLIBC) += uclibc
@@ -34,7 +29,6 @@ endif
 package-$(ADK_PACKAGE_UCLIBCXX) += uclibc++
 endif
 endif
-endif
 
 include $(TOPDIR)/package/Depends.mk
 

package/asterisk/Makefile

@@ -17,7 +17,7 @@ PKG_MULTI:=		1
 PKG_NOPARALLEL:=	1
 PKG_NEED_CXX:=		1
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc 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/cluster-glue/Makefile

@@ -15,7 +15,7 @@ PKG_URL:=		http://www.linux-ha.org/wiki/Cluster_Glue
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_NOPARALLEL:=	1
 
-PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_LIBC_DEPENDS:=	glibc musl
 PKG_ARCH_DEPENDS:=	x86 x86_64
 
 include $(TOPDIR)/mk/package.mk

package/conntrack-tools/Makefile

@@ -14,7 +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_LIBC_DEPENDS:=	uclibc glibc
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 

package/corosync/Makefile

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

package/davfs2/Makefile

@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libiconv-tiny neon fuse
 PKG_URL:=		http://savannah.nongnu.org/projects/davfs2/
 PKG_SITES:=		http://download.savannah.gnu.org/releases/davfs2/
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/digitemp/Makefile

@@ -14,7 +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_LIBC_DEPENDS:=	uclibc glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/drbd/Makefile

@@ -12,7 +12,7 @@ PKG_SECTION:=		fs
 PKG_URL:=		http://www.drbd.org/
 PKG_SITES:=		http://oss.linbit.com/drbd/8.4/
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 include $(TOPDIR)/mk/package.mk
 

package/dropbear/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dropbear
-PKG_VERSION:=		2013.62
+PKG_VERSION:=		2014.63
 PKG_RELEASE:=		2
-PKG_MD5SUM:=		ca2c7932a1399cf361f795aaa3843998
+PKG_MD5SUM:=		7066bb9a2da708f3ed06314fdc9c47fd
 PKG_DESCR:=		SSH 2 server/client designed for embedded systems
 PKG_SECTION:=		net/security
 PKG_URL:=		http://matt.ucc.asn.au/dropbear/

package/dropbear/patches/patch-Makefile_in

@@ -1,15 +1,6 @@
---- dropbear-2013.58.orig/Makefile.in	2013-04-18 16:58:14.000000000 +0200
-+++ dropbear-2013.58/Makefile.in	2013-08-13 14:33:37.000000000 +0200
-@@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h pac
- 		loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
- 		listener.h fake-rfc2553.h
- 
--dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ 
-+dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS)
- dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
- dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
- dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
-@@ -75,10 +75,9 @@ AR=@AR@
+--- dropbear-2014.63.orig/Makefile.in	2014-02-19 15:05:24.000000000 +0100
++++ dropbear-2014.63/Makefile.in	2014-03-01 18:27:41.000000000 +0100
+@@ -81,10 +81,10 @@ AR=@AR@
  RANLIB=@RANLIB@
  STRIP=@STRIP@
  INSTALL=@INSTALL@
@@ -20,15 +11,25 @@
 +CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)
 +LIBS+=@LIBS@ @CRYPTLIB@
 +LDFLAGS+=@LDFLAGS@
++
  
  EXEEXT=@EXEEXT@
  
-@@ -169,7 +168,7 @@ scp: $(SCPOBJS)  $(HEADERS) Makefile
- # multi-binary compilation.
- MULTIOBJS=
- ifeq ($(MULTI),1)
--	MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ 
-+	MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs)))
- 	CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
+@@ -163,7 +163,7 @@ dropbearkey: $(dropbearkeyobjs)
+ dropbearconvert: $(dropbearconvertobjs)
+ 
+ dropbear: $(HEADERS) $(LIBTOM_DEPS) Makefile
+-	$(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS) @CRYPTLIB@
++	$(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS)
+ 
+ dbclient: $(HEADERS) $(LIBTOM_DEPS) Makefile
+ 	$(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS)
+@@ -184,7 +184,7 @@ ifeq ($(MULTI),1)
  endif
  
+ dropbearmulti$(EXEEXT): $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile
+-	$(CC) $(LDFLAGS) -o $@ $(MULTIOBJS) $(LIBTOM_LIBS) $(LIBS) @CRYPTLIB@
++	$(CC) $(LDFLAGS) -o $@ $(MULTIOBJS) $(LIBTOM_LIBS) $(LIBS)
+ 
+ multibinary: dropbearmulti$(EXEEXT)
+ 

package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_cfg_h

@@ -0,0 +1,14 @@
+fix from
+http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html
+
+--- dropbear-2014.63.orig/libtomcrypt/src/headers/tomcrypt_cfg.h	2014-02-19 15:05:24.000000000 +0100
++++ dropbear-2014.63/libtomcrypt/src/headers/tomcrypt_cfg.h	2014-03-01 12:35:01.000000000 +0100
+@@ -60,7 +60,7 @@ LTC_EXPORT int   LTC_CALL XSTRCMP(const
+    #define ENDIAN_LITTLE
+    #define ENDIAN_32BITWORD
+    #define LTC_FAST
+-   #define LTC_FAST_TYPE    unsigned long
++   #define LTC_FAST_TYPE    unsigned long long
+ #endif
+ 
+ /* detects MIPS R5900 processors (PS2) */

package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_macros_h

@@ -0,0 +1,41 @@
+fix from:
+http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html
+
+--- dropbear-2014.63.orig/libtomcrypt/src/headers/tomcrypt_macros.h	2014-02-19 15:05:24.000000000 +0100
++++ dropbear-2014.63/libtomcrypt/src/headers/tomcrypt_macros.h	2014-03-01 12:36:23.000000000 +0100
+@@ -343,7 +343,7 @@ static inline unsigned RORc(unsigned wor
+ /* 64-bit Rotates */
+ #if !defined(__STRICT_ANSI__) && defined(__GNUC__) && defined(__x86_64__) && !defined(LTC_NO_ASM)
+ 
+-static inline unsigned long ROL64(unsigned long word, int i)
++static inline unsigned long long ROL64(unsigned long long word, int i)
+ {
+    asm("rolq %%cl,%0"
+       :"=r" (word)
+@@ -351,7 +351,7 @@ static inline unsigned long ROL64(unsign
+    return word;
+ }
+ 
+-static inline unsigned long ROR64(unsigned long word, int i)
++static inline unsigned long long ROR64(unsigned long long word, int i)
+ {
+    asm("rorq %%cl,%0"
+       :"=r" (word)
+@@ -361,7 +361,7 @@ static inline unsigned long ROR64(unsign
+ 
+ #ifndef LTC_NO_ROLC
+ 
+-static inline unsigned long ROL64c(unsigned long word, const int i)
++static inline unsigned long long ROL64c(unsigned long long word, const int i)
+ {
+    asm("rolq %2,%0"
+       :"=r" (word)
+@@ -369,7 +369,7 @@ static inline unsigned long ROL64c(unsig
+    return word;
+ }
+ 
+-static inline unsigned long ROR64c(unsigned long word, const int i)
++static inline unsigned long long ROR64c(unsigned long long word, const int i)
+ {
+    asm("rorq %2,%0"
+       :"=r" (word)

package/dropbear/patches/patch-libtommath_bn_mp_montgomery_setup_c

@@ -0,0 +1,14 @@
+fix from
+http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html
+
+--- dropbear-2014.63.orig/libtommath/bn_mp_montgomery_setup.c	2014-02-19 15:05:24.000000000 +0100
++++ dropbear-2014.63/libtommath/bn_mp_montgomery_setup.c	2014-03-01 12:34:21.000000000 +0100
+@@ -48,7 +48,7 @@ mp_montgomery_setup (mp_int * n, mp_digi
+ #endif
+ 
+   /* rho = -1/m mod b */
+-  *rho = (unsigned long)(((mp_word)1 << ((mp_word) DIGIT_BIT)) - x) & MP_MASK;
++  *rho = (mp_digit)(((mp_word)1 << ((mp_word) DIGIT_BIT)) - x) & MP_MASK;
+ 
+   return MP_OKAY;
+ }

package/dropbear/patches/patch-libtommath_tommath_h

@@ -0,0 +1,14 @@
+fix from
+http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html
+
+--- dropbear-2014.63.orig/libtommath/tommath.h	2014-02-19 15:05:24.000000000 +0100
++++ dropbear-2014.63/libtommath/tommath.h	2014-03-01 12:33:13.000000000 +0100
+@@ -73,7 +73,7 @@ extern "C" {
+    typedef signed long long   long64;
+ #endif
+ 
+-   typedef unsigned long      mp_digit;
++   typedef unsigned long long mp_digit;
+    typedef unsigned long      mp_word __attribute__ ((mode(TI)));
+ 
+    #define DIGIT_BIT          60

package/dropbear/patches/patch-options_h

@@ -1,7 +1,7 @@
 diff -Nur dropbear-2013.58.orig/options.h dropbear-2013.58/options.h
---- dropbear-2013.58.orig/options.h	2013-04-18 16:58:14.000000000 +0200
-+++ dropbear-2013.58/options.h	2013-08-13 14:29:15.000000000 +0200
-@@ -247,7 +247,7 @@ much traffic. */
+--- dropbear-2014.63.orig/options.h	2014-02-19 15:05:24.000000000 +0100
++++ dropbear-2014.63/options.h	2014-02-27 16:29:06.000000000 +0100
+@@ -264,7 +264,7 @@ much traffic. */
  /* The command to invoke for xauth when using X11 forwarding.
   * "-q" for quiet */
  #ifndef XAUTH_COMMAND

package/dropbear/patches/patch-svr-authpubkey_c

@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- dropbear-0.52.orig/svr-authpubkey.c	2008-11-11 15:09:03.000000000 +0100
-+++ dropbear-0.52/svr-authpubkey.c	2009-03-19 19:29:53.000000000 +0100
-@@ -209,6 +209,8 @@ static int checkpubkey(unsigned char* al
+--- dropbear-2014.63.orig/svr-authpubkey.c	2014-02-19 15:05:24.000000000 +0100
++++ dropbear-2014.63/svr-authpubkey.c	2014-02-27 16:29:05.000000000 +0100
+@@ -208,6 +208,8 @@ static int checkpubkey(unsigned char* al
  		goto out;
  	}
  
@@ -10,7 +10,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	/* we don't need to check pw and pw_dir for validity, since
  	 * its been done in checkpubkeyperms. */
  	len = strlen(ses.authstate.pw_dir);
-@@ -220,6 +222,9 @@ static int checkpubkey(unsigned char* al
+@@ -219,6 +221,9 @@ static int checkpubkey(unsigned char* al
  
  	/* open the file */
  	authfile = fopen(filename, "r");
@@ -20,7 +20,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	if (authfile == NULL) {
  		goto out;
  	}
-@@ -372,6 +377,8 @@ static int checkpubkeyperms() {
+@@ -371,6 +376,8 @@ static int checkpubkeyperms() {
  		goto out;
  	}
  
@@ -29,7 +29,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	/* allocate max required pathname storage,
  	 * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */
  	filename = m_malloc(len + 22);
-@@ -393,6 +400,14 @@ static int checkpubkeyperms() {
+@@ -392,6 +399,14 @@ static int checkpubkeyperms() {
  	if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
  		goto out;
  	}

package/dsniff/Makefile

@@ -15,7 +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
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-2.4
 

package/eglibc/Config.in.manual

@@ -1,26 +0,0 @@
-config ADK_PACKAGE_EGLIBC
-	prompt "eglibc............... embedded GNU C library"
-	bool
-	default y if ADK_TARGET_LIB_EGLIBC && !ADK_TOOLCHAIN_ONLY
-	default n
-	depends on ADK_TARGET_LIB_EGLIBC
-	select ADK_PACKAGE_TZDATA
-	help
-	  embedded GNU C library.
-
-config ADK_PACKAGE_EGLIBC_DBG
-	prompt "debug symbols package"
-	tristate
-	depends on ADK_PACKAGE_EGLIBC
-	depends on ADK_PACKAGE_GDB
-	depends on !ADK_DEBUG
-	default n
-	help
-
-config ADK_PACKAGE_EGLIBC_STATIC
-	prompt "eglibc-static........ C library (static version)"
-	tristate
-	default n
-	depends on ADK_TARGET_LIB_EGLIBC
-	help
-	  embedded GNU C library (static version).

package/eglibc/Makefile

@@ -1,93 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-include $(TOPDIR)/toolchain/eglibc/Makefile.inc
-
-PKG_DESCR:=		embedded GNU C library
-PKG_SECTION:=		base
-PKG_OPTS:=		noremove
-PKG_SUBPKGS:=		EGLIBC EGLIBC_DEV EGLIBC_STATIC
-
-NO_DISTFILES:=		1
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,EGLIBC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,EGLIBC_DEV,$(PKG_NAME)-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,EGLIBC_STATIC,$(PKG_NAME)-static,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-# compile nothing, eglibc is already build in toolchain directory
-do-install:
-	${INSTALL_DIR} $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH) \
-	    $(IDIR_EGLIBC)/usr/lib $(IDIR_EGLIBC)/usr/bin
-	$(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH)
-	-for file in libc libcrypt libdl libm libresolv libutil libnsl libnss_dns libnss_files; do \
-		$(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH); \
-		$(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH); \
-	done
-	$(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_EGLIBC)/usr/bin
-	${INSTALL_DIR} $(IDIR_EGLIBC)/etc 
-	${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_EGLIBC}/etc
-	${INSTALL_DATA} ./files/nsswitch.conf ${IDIR_EGLIBC}/etc
-
-eglibc-static-install:
-	${INSTALL_DIR} $(IDIR_EGLIBC_STATIC)/usr/lib
-	$(CP) $(STAGING_TARGET_DIR)/usr/lib/libc.a $(IDIR_EGLIBC_STATIC)/usr/lib
-
-eglibc-dev-install:
-	${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/$(ADK_TARGET_LIBC_PATH) $(IDIR_EGLIBC_DEV)/usr/lib
-	# install linker script
-	cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
-ifeq ($(ADK_TARGET_ABI_O32),y)
-ifeq ($(ADK_big),y)
-	$(SED) "s#@@ELFTARGET@@#elf32-tradbigmips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
-else
-	$(SED) "s#@@ELFTARGET@@#elf32-tradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
-endif
-endif
-ifeq ($(ADK_TARGET_ABI_N32),y)
-ifeq ($(ADK_big),y)
-	$(SED) "s#@@ELFTARGET@@#elf32-ntradbigmips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
-else
-	$(SED) "s#@@ELFTARGET@@#elf32-ntradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
-endif
-endif
-ifeq ($(ADK_TARGET_ABI_N64),y)
-ifeq ($(ADK_big),y)
-	$(SED) "s#@@ELFTARGET@@#elf64-tradbigmips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
-else
-	$(SED) "s#@@ELFTARGET@@#elf64-tradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
-endif
-endif
-	${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_EGLIBC_DEV}/usr/lib
-	${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_EGLIBC_DEV}/usr/lib
-	-for file in libcrypt libdl libm libresolv libutil libnsl; do \
-		cd $(IDIR_EGLIBC_DEV)/$(ADK_TARGET_LIBC_PATH)/; ln -sf $$file-$(PKG_VERSION).so $$file.so; \
-	done
-	# header package
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \
-		HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
-		INSTALL_HDR_PATH=$(IDIR_EGLIBC_DEV)/usr \
-		headers_install
-	(cd $(WRKBUILD); \
-		${EGLIBC_ENV} \
-		$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/libc/configure \
-			--host=$(REAL_GNU_TARGET_NAME) \
-			--prefix=$(IDIR_EGLIBC_DEV)/usr \
-			--with-headers=$(IDIR_EGLIBC_DEV)/usr/include \
-			${EGLIBC_CONFOPTS} \
-	);
-	PATH='${TARGET_PATH}' $(MAKE) -C $(WRKBUILD) install-headers install-bootstrap-headers=yes
-	touch $(IDIR_EGLIBC_DEV)/usr/include/gnu/stubs.h
-	touch $(IDIR_EGLIBC_DEV)/usr/include/gnu/stubs-{32,x32,64}.h
-	@find $(IDIR_EGLIBC_DEV) -name .install -exec rm {} \;
-	@find $(IDIR_EGLIBC_DEV) -name ..install.cmd -exec rm {} \;
-	# conflicts with libiconv
-	find $(IDIR_EGLIBC_DEV) -name iconv.h -exec rm {} \;
-
-include ${TOPDIR}/mk/pkg-bottom.mk

package/eglibc/files/libc.so.arm

@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-   the static library, so try that secondarily.  */
-OUTPUT_FORMAT(elf32-littlearm)
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.3 ) )

package/eglibc/files/libc.so.i586

@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-   the static library, so try that secondarily.  */
-OUTPUT_FORMAT(elf32-i386)
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.2 ) )

package/eglibc/files/libc.so.i686

@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-   the static library, so try that secondarily.  */
-OUTPUT_FORMAT(elf32-i386)
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.2 ) )

package/eglibc/files/libc.so.mips

@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-      the static library, so try that secondarily.  */
-      OUTPUT_FORMAT(@@ELFTARGET@@)
-      GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld.so.1 ) )

package/eglibc/files/libc.so.mips64

@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-      the static library, so try that secondarily.  */
-      OUTPUT_FORMAT(@@ELFTARGET@@)
-      GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld.so.1 ) )

package/eglibc/files/libc.so.mips64el

@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-      the static library, so try that secondarily.  */
-      OUTPUT_FORMAT(@@ELFTARGET@@)
-      GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld.so.1 ) )

package/eglibc/files/libc.so.mipsel

@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-   the static library, so try that secondarily.  */
-OUTPUT_FORMAT(elf32-tradlittlemips)
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld.so.1 ) )

package/eglibc/files/libc.so.ppc

@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-   the static library, so try that secondarily.  */
-OUTPUT_FORMAT(elf32-powerpc)
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld.so.1 ) )

package/eglibc/files/libc.so.ppc64

@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-   the static library, so try that secondarily.  */
-OUTPUT_FORMAT(elf64-powerpc)
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld64.so.1 ) )

package/eglibc/files/libc.so.sparc

@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-   the static library, so try that secondarily.  */
-OUTPUT_FORMAT(elf32-sparc)
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.2 ) )

package/eglibc/files/libc.so.sparc64

@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-   the static library, so try that secondarily.  */
-OUTPUT_FORMAT(elf64-sparc)
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.2 ) )

package/eglibc/files/libc.so.x86

@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-   the static library, so try that secondarily.  */
-OUTPUT_FORMAT(elf32-i386)
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux.so.2 ) )

package/eglibc/files/libc.so.x86_64

@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-      the static library, so try that secondarily.  */
-      OUTPUT_FORMAT(elf64-x86-64)
-      GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld-linux-x86-64.so.2 ) )

package/eglibc/files/nsswitch.conf

@@ -1,20 +0,0 @@
-# /etc/nsswitch.conf
-#
-# Example configuration of GNU Name Service Switch functionality.
-#
-
-passwd:		files
-group:		files
-initgroups:	files
-shadow:		files
-gshadow:	files
-
-hosts:		files dns
-networks:	files dns
-
-protocols:	files
-services:	files
-ethers:		files
-rpc:		files
-
-netgroup:	files

package/ether-wake/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_DESCR:=		A Wake-On-LAN (WOL) client
 PKG_SECTION:=		net
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 NO_DISTFILES:=		1
 

package/fbset/Makefile

@@ -11,7 +11,7 @@ PKG_DESCR:=		framebuffer utility
 PKG_SECTION:=		utils
 PKG_SITES:=		http://users.telenet.be/geertu/Linux/fbdev/
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/gdbserver/Makefile

@@ -10,7 +10,7 @@ PKG_SECTION:=		debug
 PKG_DEPENDS:=		libthread-db
 
 PKG_ARCH_DEPENDS:=	!m68k
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 PKG_SUBPKGS:=		GDBSERVER
 
 WRKSRC=                 ${WRKDIST}/gdb/gdbserver

package/gmediaserver/Makefile

@@ -15,7 +15,7 @@ PKG_URL:=		http://www.gnu.org/software/gmediaserver
 PKG_SITES:=		http://savannah.nongnu.org/download/gmediaserver/
 PKG_CXX:=		GMEDIASERVER
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/gpm/Makefile

@@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gpm
 PKG_VERSION:=		1.20.7
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		e9a4ba2711753c89b37950aada7aed4a
 PKG_DESCR:=		console mouse support
 PKG_SECTION:=		misc
-PKG_BUILDDEP:=		autotool
+PKG_BUILDDEP:=		autotool bison-host
 PKG_URL:=		http://launchpad.net/gpm
 PKG_SITES:=		http://www.nico.schottelius.org/software/gpm/archives/
 PKG_NOPARALLEL:=	1

package/heyu/Makefile

@@ -13,7 +13,7 @@ PKG_DEPENDS:=		setserial
 PKG_URL:=		http://heyu.tanj.com/
 PKG_SITES:=		http://heyu.tanj.com/download/
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
 

package/ipsec-tools/Makefile

@@ -14,7 +14,7 @@ PKG_DEPENDS:=		libopenssl
 PKG_URL:=		http://ipsec-tools.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ipsec-tools/}
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 PKG_CFLINE_IPSEC_TOOLS:=depends on !ADK_TOOLCHAIN_ONLY
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 

package/libXrender/Makefile

@@ -9,7 +9,9 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		b6702e6f56f9d9103dc688f4336529a9
 PKG_DESCR:=		X11 rendering library
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		renderproto-host libXrender-host renderproto libX11
+PKG_BUILDDEP:=		renderproto-host xproto-host xextproto-host libXau-host 
+PKG_BUILDDEP+=		xcb-proto-host libpthread-stubs-host libxcb-host kbproto-host
+PKG_BUILDDEP+=		inputproto-host xtrans-host libX11-host libXrender-host renderproto libX11
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxrender
 PKG_OPTS:=		dev

package/libcec/Makefile

@@ -17,7 +17,7 @@ PKG_OPTS:=		dev
 PKG_DEPENDS_RASPBERRY_PI:=	bcm2835-vc
 PKG_BUILDDEP_RASPBERRY_PI:=	bcm2835-vc
 PKG_SYSTEM_DEPENDS:=    raspberry-pi ibm-x40
-PKG_LIBC_DEPENDS:=      eglibc glibc musl
+PKG_LIBC_DEPENDS:=      glibc musl
 
 include $(TOPDIR)/mk/package.mk
 

package/libhugetlbfs/Makefile

@@ -13,7 +13,7 @@ PKG_URL:=		http://libhugetlbfs.ozlabs.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libhugetlbfs/}
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_LIBC_DEPENDS:=	glibc musl
 PKG_ARCH_DEPENDS:=	x86 x86_64
 
 include $(TOPDIR)/mk/package.mk

package/libnids/Makefile

@@ -15,7 +15,7 @@ PKG_URL:=		http://libnids.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libnids/}
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/libpthread/Makefile

@@ -6,9 +6,6 @@ include ${TOPDIR}/rules.mk
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 include ${TOPDIR}/toolchain/glibc/Makefile.inc
 endif
-ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
-include ${TOPDIR}/toolchain/eglibc/Makefile.inc
-endif
 ifeq ($(ADK_TARGET_LIB_MUSL),y)
 include ${TOPDIR}/toolchain/musl/Makefile.inc
 endif

package/libqb/Makefile

@@ -13,7 +13,7 @@ PKG_URL:=		https://github.com/asalkeld/libqb/wiki#wiki-Releases
 PKG_SITES:=		https://fedorahosted.org/releases/q/u/quarterback/
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_LIBC_DEPENDS:=	glibc musl
 
 include $(TOPDIR)/mk/package.mk
 

package/librpcsecgss/Makefile

@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libgssglue libtirpc autotool
 PKG_SITES:=		http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 include $(TOPDIR)/mk/package.mk
 

package/librt/Makefile

@@ -6,9 +6,6 @@ include ${TOPDIR}/rules.mk
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 include ${TOPDIR}/toolchain/glibc/Makefile.inc
 endif
-ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
-include ${TOPDIR}/toolchain/eglibc/Makefile.inc
-endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif

package/libssp/Makefile

@@ -6,9 +6,6 @@ include ${TOPDIR}/rules.mk
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 include ${TOPDIR}/toolchain/glibc/Makefile.inc
 endif
-ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
-include ${TOPDIR}/toolchain/eglibc/Makefile.inc
-endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif

package/libstdcxx/Makefile

@@ -5,16 +5,12 @@ include ${TOPDIR}/rules.mk
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 include ${TOPDIR}/toolchain/glibc/Makefile.inc
 else
-ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
-include ${TOPDIR}/toolchain/eglibc/Makefile.inc
-else
 ifeq ($(ADK_TARGET_LIB_MUSL),y)
 include ${TOPDIR}/toolchain/musl/Makefile.inc
 else
 include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif
 endif
-endif
 
 PKG_NAME:=		libstdcxx
 PKG_DESCR:=		C++ support library

package/libthread_db/Makefile

@@ -6,9 +6,6 @@ include ${TOPDIR}/rules.mk
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 include ${TOPDIR}/toolchain/glibc/Makefile.inc
 endif
-ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
-include ${TOPDIR}/toolchain/eglibc/Makefile.inc
-endif
 ifeq ($(ADK_TARGET_LIB_MUSL),y)
 include ${TOPDIR}/toolchain/musl/Makefile.inc
 endif

package/libtirpc/Makefile

@@ -15,7 +15,7 @@ PKG_URL:=		http://sourceforge.net/projects/libtirpc/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libtirpc/}
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 

package/libunistring/Makefile

@@ -13,7 +13,7 @@ PKG_URL:=		http://www.gnu.org/software/libunistring/
 PKG_SITES:=		${MASTER_SITE_GNU:=libunistring/}
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/libvirt/Makefile

@@ -19,7 +19,7 @@ PKG_OPTS:=		dev
 
 PKG_HOST_DEPENDS:=	!freebsd !netbsd !openbsd
 PKG_ARCH_DEPENDS:=	x86 x86_64
-PKG_LIBC_DEPENDS:=	eglibc glibc
+PKG_LIBC_DEPENDS:=	glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/libxml2/patches/patch-python_setup_py

@@ -1,11 +0,0 @@
---- libxml2-2.9.1.orig/python/setup.py	2013-04-19 09:36:20.000000000 +0200
-+++ libxml2-2.9.1/python/setup.py	2013-11-21 18:47:16.000000000 +0100
-@@ -8,7 +8,7 @@ from distutils.core import setup, Extens
- # Below ROOT, we expect to find include, include/libxml2, lib and bin.
- # On *nix, it is not needed (but should not harm), 
- # on Windows, it is set by configure.js.
--ROOT = r'/usr' 
-+ROOT = r'/Volumes/adk/openadk/host_i686_gnu_eglibc/usr' 
- 
- # Thread-enabled libxml2
- with_threads = 1

package/llvm/Makefile

@@ -12,7 +12,7 @@ PKG_SECTION:=		lang
 PKG_URL:=		http://llvm.org/
 PKG_SITES:=		http://llvm.org/releases/3.4/
 
-PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_LIBC_DEPENDS:=	glibc musl
 PKG_HOST_DEPENDS:=	!darwin
 PKG_ARCH_DEPENDS:=	mips x86 x86_64 arm
 

package/lsof/Makefile

@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libtirpc
 PKG_URL:=		http://people.freebsd.org/~abe/
 PKG_SITES:=		ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 DISTFILES:=             ${PKG_NAME}_${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_${PKG_VERSION}

package/m4/Makefile

@@ -13,7 +13,7 @@ PKG_BUILDDEP:=		m4-host
 PKG_URL:=		http://www.gnu.org/software/m4/
 PKG_SITES:=		${MASTER_SITE_GNU:=m4/}
 
-PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_LIBC_DEPENDS:=	glibc musl
 
 include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk

package/mtr/Makefile

@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		ncurses
 PKG_URL:=		http://www.bitwizard.nl/mtr/
 PKG_SITES:=		ftp://ftp.bitwizard.nl/mtr/
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/musl/Makefile

@@ -49,8 +49,8 @@ endif
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 MARCH:=			armhf
 endif
-ifeq ($(CPU_ARCH),sh4)
-MARCH:=			sh
+ifeq ($(ADK_TARGET_ABI_X32),y)
+MARCH:=			x32
 endif
 
 # do nothing, musl is already build in toolchain directory

package/ndisc/Makefile

@@ -12,7 +12,7 @@ PKG_SECTION:=		ipv6
 PKG_URL:=		http://www.remlab.net/
 PKG_SITES:=		http://www.remlab.net/files/ndisc6/
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 PKG_SUBPKGS:=		NDISC6 RDISC6 TCPTRACEROUTE6
 

package/nfs-utils/Makefile

@@ -15,7 +15,7 @@ PKG_BUILDDEP:=		keyutils libtirpc lvm
 PKG_URL:=		http://sourceforge.net/projects/nfs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 PKG_SUBPKGS:=		NFS_UTILS NFS_UTILS_CLIENT NFS_UTILS_SERVER
 PKGSS_NFS_UTILS_CLIENT:=kmod-nfs-fs kmod-sunrpc

package/omxplayer/Makefile

@@ -17,7 +17,7 @@ PKG_URL:=		https://github.com/popcornmix/omxplayer
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
-PKG_LIBC_DEPENDS:=      eglibc glibc musl
+PKG_LIBC_DEPENDS:=      glibc musl
 
 include $(TOPDIR)/mk/package.mk
 

package/openafs/Makefile

@@ -12,7 +12,7 @@ PKG_SECTION:=		net/fs
 PKG_URL:=		http://openafs.org
 PKG_SITES:=		http://www.openafs.org/dl/openafs/${PKG_VERSION}/
 
-PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_LIBC_DEPENDS:=	glibc musl
 PKG_CFLINE_OPENAFS+=	select ADK_KERNEL_KEYS
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}-src.tar.bz2

package/openjdk7/Makefile

@@ -30,7 +30,7 @@ GCJ_VER:=		4.8.2
 
 PKG_HOST_DEPENDS:=	linux
 PKG_ARCH_DEPENDS:=	arm mips ppc x86 x86_64
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 PKG_SYSTEM_DEPENDS:=	!lemote-yeelong
 
 include $(TOPDIR)/mk/host.mk

package/oprofile/Makefile

@@ -15,7 +15,7 @@ PKG_URL:=		http://oprofile.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=oprofile/}
 
 PKG_ARCH_DEPENDS:=	!m68k
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 PKG_CFLINE_OPROFILE:=	select BUSYBOX_EXPR
 

package/pacemaker-mgmt/Makefile

@@ -13,7 +13,7 @@ PKG_BUILDDEP:=		swig-host pacemaker gnutls pam python2
 PKG_URL:=		http://hg.clusterlabs.org/pacemaker/pygui/
 PKG_SITES:=		http://openadk.org/distfiles/
 
-PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_LIBC_DEPENDS:=	glibc musl
 PKG_ARCH_DEPENDS:=      x86 x86_64
 
 include $(TOPDIR)/mk/package.mk

package/pacemaker/Makefile

@@ -15,7 +15,7 @@ PKG_DEPENDS+=		bash resource-agents pam libgnutls glib libxslt libxml2 libltdl l
 PKG_URL:=		http://www.clusterlabs.org/
 PKG_SITES:=		http://openadk.org/distfiles/
 
-PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_LIBC_DEPENDS:=	glibc musl
 PKG_ARCH_DEPENDS:=	x86 x86_64
 
 include $(TOPDIR)/mk/package.mk

package/pcc/Makefile

@@ -30,9 +30,6 @@ CONFIGURE_ARGS+=	--with-linker=/usr/bin/ld
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
 TARGET_CPPFLAGS+=	-DADK_FOR_GLIBC
 else
-ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
-TARGET_CPPFLAGS+=	-DADK_FOR_GLIBC
-else
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 TARGET_CPPFLAGS+=	-DADK_FOR_UCLIBC
 endif

package/pcrepp/Makefile

@@ -17,7 +17,7 @@ PKG_NEED_CXX:=		1
 PKG_CXX:=		pcrepp
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_LIBC_DEPENDS:=	glibc musl
 
 DISTFILES:=		pcre++-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/pcre++-${PKG_VERSION}

package/portsentry/Makefile

@@ -12,7 +12,7 @@ PKG_SECTION:=		net/security
 PKG_URL:=		http://sourceforge.net/projects/sentrytools
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=sentrytools/}
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}_beta
 

package/ppp/Makefile

@@ -15,7 +15,7 @@ PKG_URL:=		http://ppp.samba.org/
 PKG_SITES:=		ftp://ftp.samba.org/pub/ppp/
 PKG_MULTI:=		1
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 PKG_SUBPKGS:=		PPP PPP_MOD_PPPOA PPP_MOD_PPPOE PPP_MOD_RADIUS
 PKG_SUBPKGS+=		PPP_MOD_CHAT PPP_MOD_PPPDUMP PPP_MOD_PPPSTATS PPP_MOD_PPPUMTS

package/pptpd/Makefile

@@ -13,7 +13,7 @@ PKG_DEPENDS:=		ppp kmod-crypto kmod-ppp-mppe kmod-ppp kmod-net-ipgre
 PKG_URL:=		http://www.poptop.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=poptop/}
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/proftpd/Makefile

@@ -13,7 +13,7 @@ PKG_URL:=		http://www.proftpd.org/
 PKG_SITES:=		ftp://ftp.proftpd.org/distrib/source/
 PKG_NOPARALLEL:=	1
 
-PKG_LIBC_DEPENDS:=	eglibc glibc
+PKG_LIBC_DEPENDS:=	glibc
 PKG_CFLINE_PROFTPD:=	depends on ADK_BROKEN
 
 PKG_FLAVOURS_PROFTPD:=	WITH_FTPUSERS

package/pulseaudio/Makefile

@@ -18,7 +18,7 @@ PKG_URL:=		http://www.freedesktop.org/wiki/Software/PulseAudio/
 PKG_SITES:=		http://freedesktop.org/software/pulseaudio/releases/
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
 

package/resource-agents/Makefile

@@ -13,7 +13,7 @@ PKG_BUILDDEP:=		glib cluster-glue
 PKG_URL:=		https://github.com/ClusterLabs/resource-agents
 PKG_SITES:=		http://openadk.org/distfiles/
 
-PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_LIBC_DEPENDS:=	glibc musl
 PKG_ARCH_DEPENDS:=	x86 x86_64
 
 include $(TOPDIR)/mk/package.mk

package/rng-tools/Makefile

@@ -12,7 +12,7 @@ PKG_SECTION:=		crypto
 PKG_URL:=		http://gkernel.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=gkernel/}
 
-PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_LIBC_DEPENDS:=	glibc musl
 
 include $(TOPDIR)/mk/package.mk
 

package/rp-pppoe/Makefile

@@ -13,7 +13,7 @@ PKG_DEPENDS:=		ppp
 PKG_URL:=		http://www.roaringpenguin.com/
 PKG_SITES:=		http://www.roaringpenguin.com/files/download/
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 PKG_SUBPKGS:=		PPPOE_CLIENT PPPOE_RELAY PPPOE_SERVER PPPOE_SNIFF
 
 WRKSRC=			${WRKDIST}/src

package/rpcbind/Makefile

@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libtirpc autotool
 PKG_URL:=		http://sourceforge.net/projects/rpcbind/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=rpcbind/}
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 

package/scanlogd/Makefile

@@ -15,7 +15,7 @@ PKG_URL:=		http://www.openwall.com/scanlogd/
 PKG_SITES:=		http://www.openwall.com/scanlogd/
 
 PKG_ARCH_DEPENDS:=	!arm
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/snort/Makefile

@@ -15,7 +15,7 @@ PKG_URL:=		http://www.snort.org/
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_NOPARALLEL:=	1
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/socat/Makefile

@@ -4,16 +4,20 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		socat
-PKG_VERSION:=		1.7.2.2
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		fe70c821a104378a834c3ed1b5971e54
+PKG_VERSION:=		1.7.2.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		6943f7a5e1ffd553ad2a900bbf05b83a
 PKG_DESCR:=		A multipurpose relay (SOcket CAT)
 PKG_SECTION:=		net/misc
-PKG_DEPENDS:=		libpthread libopenssl
-PKG_BUILDDEP:=		openssl
+PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://www.dest-unreach.org/socat/
 PKG_SITES:=		http://www.dest-unreach.org/socat/download/
 
+PKG_FLAVOURS_SOCAT:=	WITH_SSL
+PKGFD_WITH_SSL:=	enable SSL support
+PKGFS_WITH_SSL:=	libopenssl
+PKGFB_WITH_SSL:=	openssl
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SOCAT,socat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -25,6 +29,12 @@ CONFIGURE_ENV+=		sc_cv_termios_ispeed="no" \
 CONFIGURE_ARGS+=	--disable-libwrap \
 			--disable-readline
 
+ifneq (${ADK_PACKAGE_SOCAT_WITH_SSL},)
+CONFIGURE_ARGS+=	--enable-openssl
+else
+CONFIGURE_ARGS+=	--disable-openssl
+endif
+
 socat-install:
 	${INSTALL_DIR} ${IDIR_SOCAT}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/socat ${IDIR_SOCAT}/usr/bin/

package/squeezelite/Makefile

@@ -16,7 +16,7 @@ PKG_BUILDDEP+=		faad2
 PKG_URL:=		http://code.google.com/p/squeezelite/
 PKG_SITES:=		http://openadk.org/distfiles/
 
-PKG_LIBC_DEPENDS:=	eglibc glibc musl
+PKG_LIBC_DEPENDS:=	glibc musl
 
 include $(TOPDIR)/mk/package.mk
 

package/ssltunnel/Makefile

@@ -13,7 +13,7 @@ PKG_DEPENDS:=		libopenssl ppp
 PKG_BUILDDEP:=		openssl ppp
 PKG_SITES:=		http://www.hsc.fr/ressources/outils/ssltunnel/download/
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 include ${TOPDIR}/mk/package.mk
 

package/strongswan/Makefile

@@ -18,7 +18,7 @@ PKG_DEPENDS+=		kmod-crypto-hmac kmod-crypto-cbc kmod-crypto-authenc
 PKG_URL:=		http://strongswan.org/index.htm
 PKG_SITES:=		http://download.strongswan.org/
 
-PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+PKG_LIBC_DEPENDS:=	uclibc glibc
 
 PKG_CHOICES_STRONGSWAN:=WITH_GMP WITH_OPENSSL WITH_GNUTLS
 PKGCD_WITH_GMP:=	use GMP for crypto