summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-02 15:26:07 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-02 15:26:07 +0100
commitf6c5a79972bcd216429484eb706fc47c7bb52a75 (patch)
tree4f5e17701c66df5d2359486687f1fd41b2fb469e
parent00fa581bc6acc3158b3008019e81802a5d70418c (diff)
parentb8e1fbce6811e906e7c8bd21f4e7fe1aa4881585 (diff)
resolve merge conflict
-rw-r--r--mk/build.mk25
-rw-r--r--mk/package.mk6
-rw-r--r--mk/pkg-bottom.mk2
-rw-r--r--package/Makefile6
-rw-r--r--package/asterisk/Makefile2
-rw-r--r--package/cluster-glue/Makefile2
-rw-r--r--package/conntrack-tools/Makefile2
-rw-r--r--package/corosync/Makefile2
-rw-r--r--package/davfs2/Makefile2
-rw-r--r--package/digitemp/Makefile2
-rw-r--r--package/drbd/Makefile2
-rw-r--r--package/dsniff/Makefile2
-rw-r--r--package/eglibc/Config.in.manual26
-rw-r--r--package/eglibc/Makefile93
-rw-r--r--package/eglibc/files/libc.so.arm5
-rw-r--r--package/eglibc/files/libc.so.i5865
-rw-r--r--package/eglibc/files/libc.so.i6865
-rw-r--r--package/eglibc/files/libc.so.mips5
-rw-r--r--package/eglibc/files/libc.so.mips645
-rw-r--r--package/eglibc/files/libc.so.mips64el5
-rw-r--r--package/eglibc/files/libc.so.mipsel5
-rw-r--r--package/eglibc/files/libc.so.ppc5
-rw-r--r--package/eglibc/files/libc.so.ppc645
-rw-r--r--package/eglibc/files/libc.so.sparc5
-rw-r--r--package/eglibc/files/libc.so.sparc645
-rw-r--r--package/eglibc/files/libc.so.x865
-rw-r--r--package/eglibc/files/libc.so.x86_645
-rw-r--r--package/eglibc/files/nsswitch.conf20
-rw-r--r--package/ether-wake/Makefile2
-rw-r--r--package/fbset/Makefile2
-rw-r--r--package/gdbserver/Makefile2
-rw-r--r--package/gmediaserver/Makefile2
-rw-r--r--package/heyu/Makefile2
-rw-r--r--package/ipsec-tools/Makefile2
-rw-r--r--package/libcec/Makefile2
-rw-r--r--package/libhugetlbfs/Makefile2
-rw-r--r--package/libnids/Makefile2
-rw-r--r--package/libpthread/Makefile3
-rw-r--r--package/libqb/Makefile2
-rw-r--r--package/librpcsecgss/Makefile2
-rw-r--r--package/librt/Makefile3
-rw-r--r--package/libssp/Makefile3
-rw-r--r--package/libstdcxx/Makefile4
-rw-r--r--package/libthread_db/Makefile3
-rw-r--r--package/libtirpc/Makefile2
-rwxr-xr-xpackage/libunistring/Makefile2
-rw-r--r--package/libvirt/Makefile2
-rw-r--r--package/libxml2/patches/patch-python_setup_py11
-rw-r--r--package/llvm/Makefile2
-rw-r--r--package/lsof/Makefile2
-rw-r--r--package/m4/Makefile2
-rw-r--r--package/mtr/Makefile2
-rw-r--r--package/ndisc/Makefile2
-rw-r--r--package/nfs-utils/Makefile2
-rw-r--r--package/omxplayer/Makefile2
-rw-r--r--package/openafs/Makefile2
-rw-r--r--package/openjdk7/Makefile2
-rw-r--r--package/oprofile/Makefile2
-rw-r--r--package/pacemaker-mgmt/Makefile2
-rw-r--r--package/pacemaker/Makefile2
-rw-r--r--package/pcc/Makefile3
-rw-r--r--package/pcrepp/Makefile2
-rw-r--r--package/portsentry/Makefile2
-rw-r--r--package/ppp/Makefile2
-rw-r--r--package/pptpd/Makefile2
-rw-r--r--package/proftpd/Makefile2
-rw-r--r--package/pulseaudio/Makefile2
-rw-r--r--package/python2/Makefile13
-rw-r--r--package/python2/files/patch-Lib_distutils_sysconfig_py10
-rw-r--r--package/python2/files/python-config.patch4
-rw-r--r--package/python2/patches/patch-Lib_distutils_sysconfig_py10
-rw-r--r--package/resource-agents/Makefile2
-rw-r--r--package/rng-tools/Makefile2
-rw-r--r--package/rp-pppoe/Makefile2
-rw-r--r--package/rpcbind/Makefile2
-rw-r--r--package/scanlogd/Makefile2
-rw-r--r--package/snort/Makefile2
-rw-r--r--package/socat/Makefile20
-rw-r--r--package/squeezelite/Makefile2
-rw-r--r--package/ssltunnel/Makefile2
-rw-r--r--package/strongswan/Makefile2
-rw-r--r--package/syslinux/patches/patch-com32_cmenu_complex_c32bin74113 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_cmenu_display_c32bin28995 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_cmenu_simple_c32bin49545 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_cmenu_test2_c32bin73558 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_cmenu_test_c32bin71651 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_gfxboot_gfxboot_c32bin44803 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_hdt_hdt_c32bin474295 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_libutil_libutil_com_abin63705 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_libutil_libutil_lnx_abin269249 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_lua_src_lua_c32bin415545 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_mboot_mboot_c32bin63379 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_menu_menu_c32bin115544 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_menu_vesamenu_c32bin269531 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_cat_c32bin12237 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_chain_c32bin36049 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_cmd_c32bin1683 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_config_c32bin10319 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_cpuid_c32bin11473 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_cpuidtest_c32bin22736 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_disk_c32bin11360 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_dmitest_c32bin69719 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_elf_c32bin53553 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_ethersel_c32bin54754 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_gpxecmd_c32bin5022 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_host_c32bin9590 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_ifcpu64_c32bin2627 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_ifcpu_c32bin28662 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_ifplop_c32bin4982 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_kbdmap_c32bin10637 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_linux_c32bin34675 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_ls_c32bin20023 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_meminfo_c32bin11147 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_pcitest_c32bin60465 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_pmload_c32bin27073 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_pwd_c32bin4106 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_sanboot_c32bin5150 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_sdi_c32bin47885 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_vesainfo_c32bin11300 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_vpdtest_c32bin12100 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_modules_whichsys_c32bin5807 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_rosh_rosh_c32bin39736 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_samples_advdump_c32bin10637 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_samples_entrydump_c32bin9941 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_samples_fancyhello_c32bin17857 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_samples_fancyhello_lnxbin25415 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_samples_hello_c32bin10645 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_samples_keytest_c32bin19824 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_samples_keytest_lnxbin51699 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_samples_resolv_c32bin9747 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_samples_serialinfo_c32bin9802 -> 0 bytes
-rw-r--r--package/syslinux/patches/patch-com32_sysdump_sysdump_c32bin72542 -> 0 bytes
-rw-r--r--package/traceroute/Makefile2
-rw-r--r--package/v4l-utils/Makefile2
-rw-r--r--package/vlc/Makefile2
-rw-r--r--package/xbmc/Makefile2
-rw-r--r--package/xf86-input-evdev/Makefile2
-rw-r--r--package/xfsprogs/Makefile2
-rw-r--r--target/arm/sys-available/keyasic-ka20004
-rw-r--r--target/config/Config.in60
-rw-r--r--target/config/Config.in.tools4
-rw-r--r--target/packages/pkg-available/development1
-rw-r--r--target/packages/pkg-available/test8
-rw-r--r--toolchain/Makefile6
-rw-r--r--toolchain/eglibc/Makefile99
-rw-r--r--toolchain/eglibc/Makefile.inc34
-rw-r--r--toolchain/eglibc/eglibc.config47
-rw-r--r--toolchain/eglibc/patches/cygwin.patch9
-rw-r--r--toolchain/eglibc/patches/eglibc-cross.patch80
-rw-r--r--toolchain/eglibc/patches/sparc64.patch21
-rw-r--r--toolchain/gcc/Makefile12
-rw-r--r--tools/Makefile3
-rw-r--r--tools/adk/depmaker.c2
-rw-r--r--tools/adk/pkgmaker.c9
-rw-r--r--tools/gperf/Makefile25
155 files changed, 152 insertions, 712 deletions
diff --git a/mk/build.mk b/mk/build.mk
index c0f05556f..37f27b12b 100644
--- a/mk/build.mk
+++ b/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 \
@@ -389,6 +389,12 @@ endif
|sed -e "s#^config \(.*\)#\1=y#" \
>> $(TOPDIR)/.defconfig; \
fi
+ @if [ ! -z "$(COLLECTION)" ];then \
+ grep -h "^config" target/packages/pkg-available/* \
+ |grep -i "$(COLLECTION)" \
+ |sed -e "s#^config \(.*\)#\1=y#" \
+ >> $(TOPDIR)/.defconfig; \
+ fi
@if [ ! -z "$(PKG)" ];then \
grep "^config" target/config/Config.in \
|grep -i "$(PKG)" \
@@ -533,7 +539,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; \
( \
@@ -552,13 +558,14 @@ bulktoolchain:
done
test-framework:
- for libc in uclibc eglibc glibc musl;do \
+ 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); \
+ tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#"); \
+ echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \
$(GMAKE) prereq && \
- $(GMAKE) ARCH=$$arch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive defconfig; \
+ $(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive COLLECTION=test defconfig; \
$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \
rm .config; \
done; \
@@ -568,7 +575,7 @@ test-framework:
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); \
@@ -583,7 +590,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 \
@@ -603,7 +610,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 \
@@ -623,7 +630,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 \
diff --git a/mk/package.mk b/mk/package.mk
index 264cd06e0..d5d48c1e1 100644
--- a/mk/package.mk
+++ b/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
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 3988a676f..66feea33c 100644
--- a/mk/pkg-bottom.mk
+++ b/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;\
diff --git a/package/Makefile b/package/Makefile
index f6f608a69..eb49efd6a 100644
--- a/package/Makefile
+++ b/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
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index f436d9ef7..964c417df 100644
--- a/package/asterisk/Makefile
+++ b/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
diff --git a/package/cluster-glue/Makefile b/package/cluster-glue/Makefile
index f4998efc2..f66c89909 100644
--- a/package/cluster-glue/Makefile
+++ b/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
diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile
index 22390a0a7..89bb7b895 100644
--- a/package/conntrack-tools/Makefile
+++ b/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
diff --git a/package/corosync/Makefile b/package/corosync/Makefile
index 902b773a0..633d32884 100644
--- a/package/corosync/Makefile
+++ b/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
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index cde8727d3..c832d6c4c 100644
--- a/package/davfs2/Makefile
+++ b/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
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index c5968a420..9ad1bc351 100644
--- a/package/digitemp/Makefile
+++ b/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
diff --git a/package/drbd/Makefile b/package/drbd/Makefile
index 49f8169be..f7de4f0a0 100644
--- a/package/drbd/Makefile
+++ b/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
diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile
index 813956bfc..2a59865af 100644
--- a/package/dsniff/Makefile
+++ b/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
diff --git a/package/eglibc/Config.in.manual b/package/eglibc/Config.in.manual
deleted file mode 100644
index 9c45c4c66..000000000
--- a/package/eglibc/Config.in.manual
+++ /dev/null
@@ -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).
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
deleted file mode 100644
index 9070b5b09..000000000
--- a/package/eglibc/Makefile
+++ /dev/null
@@ -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=$(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
diff --git a/package/eglibc/files/libc.so.arm b/package/eglibc/files/libc.so.arm
deleted file mode 100644
index a79b29aa3..000000000
--- a/package/eglibc/files/libc.so.arm
+++ /dev/null
@@ -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 ) )
diff --git a/package/eglibc/files/libc.so.i586 b/package/eglibc/files/libc.so.i586
deleted file mode 100644
index cd8724cc5..000000000
--- a/package/eglibc/files/libc.so.i586
+++ /dev/null
@@ -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 ) )
diff --git a/package/eglibc/files/libc.so.i686 b/package/eglibc/files/libc.so.i686
deleted file mode 100644
index cd8724cc5..000000000
--- a/package/eglibc/files/libc.so.i686
+++ /dev/null
@@ -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 ) )
diff --git a/package/eglibc/files/libc.so.mips b/package/eglibc/files/libc.so.mips
deleted file mode 100644
index 9e73ea39c..000000000
--- a/package/eglibc/files/libc.so.mips
+++ /dev/null
@@ -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 ) )
diff --git a/package/eglibc/files/libc.so.mips64 b/package/eglibc/files/libc.so.mips64
deleted file mode 100644
index 9e73ea39c..000000000
--- a/package/eglibc/files/libc.so.mips64
+++ /dev/null
@@ -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 ) )
diff --git a/package/eglibc/files/libc.so.mips64el b/package/eglibc/files/libc.so.mips64el
deleted file mode 100644
index 9e73ea39c..000000000
--- a/package/eglibc/files/libc.so.mips64el
+++ /dev/null
@@ -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 ) )
diff --git a/package/eglibc/files/libc.so.mipsel b/package/eglibc/files/libc.so.mipsel
deleted file mode 100644
index 6a6ff5582..000000000
--- a/package/eglibc/files/libc.so.mipsel
+++ /dev/null
@@ -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 ) )
diff --git a/package/eglibc/files/libc.so.ppc b/package/eglibc/files/libc.so.ppc
deleted file mode 100644
index 3d4612706..000000000
--- a/package/eglibc/files/libc.so.ppc
+++ /dev/null
@@ -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 ) )
diff --git a/package/eglibc/files/libc.so.ppc64 b/package/eglibc/files/libc.so.ppc64
deleted file mode 100644
index 35a1edcc7..000000000
--- a/package/eglibc/files/libc.so.ppc64
+++ /dev/null
@@ -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 ) )
diff --git a/package/eglibc/files/libc.so.sparc b/package/eglibc/files/libc.so.sparc
deleted file mode 100644
index 91fa2c87d..000000000
--- a/package/eglibc/files/libc.so.sparc
+++ /dev/null
@@ -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 ) )
diff --git a/package/eglibc/files/libc.so.sparc64 b/package/eglibc/files/libc.so.sparc64
deleted file mode 100644
index 2b0324525..000000000
--- a/package/eglibc/files/libc.so.sparc64
+++ /dev/null
@@ -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 ) )
diff --git a/package/eglibc/files/libc.so.x86 b/package/eglibc/files/libc.so.x86
deleted file mode 100644
index cd8724cc5..000000000
--- a/package/eglibc/files/libc.so.x86
+++ /dev/null
@@ -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 ) )
diff --git a/package/eglibc/files/libc.so.x86_64 b/package/eglibc/files/libc.so.x86_64
deleted file mode 100644
index a2e2de87f..000000000
--- a/package/eglibc/files/libc.so.x86_64
+++ /dev/null
@@ -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 ) )
diff --git a/package/eglibc/files/nsswitch.conf b/package/eglibc/files/nsswitch.conf
deleted file mode 100644
index 53bb9d3dd..000000000
--- a/package/eglibc/files/nsswitch.conf
+++ /dev/null
@@ -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
diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile
index 1a60edee5..55f62d9c7 100644
--- a/package/ether-wake/Makefile
+++ b/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
diff --git a/package/fbset/Makefile b/package/fbset/Makefile
index 6943d6d68..bd8186ceb 100644
--- a/package/fbset/Makefile
+++ b/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
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index d77558eb6..b0d2fdb38 100644
--- a/package/gdbserver/Makefile
+++ b/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
diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile
index af459b3f9..46d12a53a 100644
--- a/package/gmediaserver/Makefile
+++ b/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
diff --git a/package/heyu/Makefile b/package/heyu/Makefile
index d4dd07df8..8a9c58859 100644
--- a/package/heyu/Makefile
+++ b/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
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index bdcdf3cac..2856c1d51 100644
--- a/package/ipsec-tools/Makefile
+++ b/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
diff --git a/package/libcec/Makefile b/package/libcec/Makefile
index 7cfd8f369..4f07c5bae 100644
--- a/package/libcec/Makefile
+++ b/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
diff --git a/package/libhugetlbfs/Makefile b/package/libhugetlbfs/Makefile
index 0cab56e39..9378b1997 100644
--- a/package/libhugetlbfs/Makefile
+++ b/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
diff --git a/package/libnids/Makefile b/package/libnids/Makefile
index 66a83f79f..50e930599 100644
--- a/package/libnids/Makefile
+++ b/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
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index 764730c43..f6f9e5f5f 100644
--- a/package/libpthread/Makefile
+++ b/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
diff --git a/package/libqb/Makefile b/package/libqb/Makefile
index 97eec0646..e9bd72bd6 100644
--- a/package/libqb/Makefile
+++ b/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
diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile
index 1b8c7beb9..511f62b69 100644
--- a/package/librpcsecgss/Makefile
+++ b/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
diff --git a/package/librt/Makefile b/package/librt/Makefile
index f26e2ada3..d056bc203 100644
--- a/package/librt/Makefile
+++ b/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
diff --git a/package/libssp/Makefile b/package/libssp/Makefile
index 161da5304..a5a4a2dc7 100644
--- a/package/libssp/Makefile
+++ b/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
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index 7910af6b7..7fc3503f8 100644
--- a/package/libstdcxx/Makefile
+++ b/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
diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile
index 46abcd005..ed92676a3 100644
--- a/package/libthread_db/Makefile
+++ b/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
diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile
index 84f85a703..a1bfab5d1 100644
--- a/package/libtirpc/Makefile
+++ b/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
diff --git a/package/libunistring/Makefile b/package/libunistring/Makefile
index 3831e0638..454c5ba1b 100755
--- a/package/libunistring/Makefile
+++ b/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
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index 9b76da0b9..0e6b22af2 100644
--- a/package/libvirt/Makefile
+++ b/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
diff --git a/package/libxml2/patches/patch-python_setup_py b/package/libxml2/patches/patch-python_setup_py
deleted file mode 100644
index 13ec3493d..000000000
--- a/package/libxml2/patches/patch-python_setup_py
+++ /dev/null
@@ -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
diff --git a/package/llvm/Makefile b/package/llvm/Makefile
index 2375e092c..8bc1c5993 100644
--- a/package/llvm/Makefile
+++ b/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
diff --git a/package/lsof/Makefile b/package/lsof/Makefile
index 1dd291110..6415703fc 100644
--- a/package/lsof/Makefile
+++ b/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}
diff --git a/package/m4/Makefile b/package/m4/Makefile
index f34780964..94b39a14e 100644
--- a/package/m4/Makefile
+++ b/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
diff --git a/package/mtr/Makefile b/package/mtr/Makefile
index c00a554cd..fece3ba41 100644
--- a/package/mtr/Makefile
+++ b/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
diff --git a/package/ndisc/Makefile b/package/ndisc/Makefile
index b82b4ebb8..fbd5f4a23 100644
--- a/package/ndisc/Makefile
+++ b/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
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 20bb4b1a2..694c9d7ae 100644
--- a/package/nfs-utils/Makefile
+++ b/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
diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile
index a4da71aef..98d09ea39 100644
--- a/package/omxplayer/Makefile
+++ b/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
diff --git a/package/openafs/Makefile b/package/openafs/Makefile
index d22a1d691..b0a2b5d83 100644
--- a/package/openafs/Makefile
+++ b/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
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index d9c2f04de..b86680a7b 100644
--- a/package/openjdk7/Makefile
+++ b/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
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile
index 622c246d4..854270011 100644
--- a/package/oprofile/Makefile
+++ b/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
diff --git a/package/pacemaker-mgmt/Makefile b/package/pacemaker-mgmt/Makefile
index 29ece82cd..4fae950ca 100644
--- a/package/pacemaker-mgmt/Makefile
+++ b/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
diff --git a/package/pacemaker/Makefile b/package/pacemaker/Makefile
index fcbede425..ee3dbebb7 100644
--- a/package/pacemaker/Makefile
+++ b/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
diff --git a/package/pcc/Makefile b/package/pcc/Makefile
index 8adc848ca..891651d3a 100644
--- a/package/pcc/Makefile
+++ b/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
diff --git a/package/pcrepp/Makefile b/package/pcrepp/Makefile
index 20b8a5177..e96d04e38 100644
--- a/package/pcrepp/Makefile
+++ b/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}
diff --git a/package/portsentry/Makefile b/package/portsentry/Makefile
index a68b55593..7878c2da4 100644
--- a/package/portsentry/Makefile
+++ b/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
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 2458c68f2..08d545c79 100644
--- a/package/ppp/Makefile
+++ b/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
diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile
index 07ae9cc1a..b07203521 100644
--- a/package/pptpd/Makefile
+++ b/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
diff --git a/package/proftpd/Makefile b/package/proftpd/Makefile
index cb0662354..ff15a601b 100644
--- a/package/proftpd/Makefile
+++ b/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
diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile
index f1cf961e1..ba8c55397 100644
--- a/package/pulseaudio/Makefile
+++ b/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
diff --git a/package/python2/Makefile b/package/python2/Makefile
index 25378bd52..fe284da9d 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= python2
PKG_VERSION:= 2.7.5
-PKG_RELEASE:= 10
+PKG_RELEASE:= 11
PKG_MD5SUM:= b4f01a1d0ba0b46b05c73b2ac909b1df
PKG_DESCR:= Python scripting language (Version 2)
PKG_SECTION:= lang
@@ -103,11 +103,20 @@ HOST_CONFIGURE_ARGS:= --with-threads \
--without-cxx-main
CFLAGS_FOR_BUILD+= -fPIC
+post-extract:
+ $(CP) $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD)
+ $(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
+ $(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
+ (cd $(WRKBUILD) && patch -p0 <$(WRKBUILD)/patch-Lib_distutils_sysconfig_py)
+
hostpost-install:
$(INSTALL_BIN) ${WRKBUILD}/Parser/pgen \
$(STAGING_HOST_DIR)/usr/bin/pgen
+ $(CP) $(TOPDIR)/package/python2/files/python-config.patch $(WRKBUILD)/
+ $(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/python-config.patch
+ $(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/python-config.patch
(cd $(STAGING_HOST_DIR)/usr/bin && \
- patch -p0 < $(TOPDIR)/package/python2/files/python-config.patch)
+ patch -p0 < $(WRKBUILD)/python-config.patch)
pre-configure:
$(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \
diff --git a/package/python2/files/patch-Lib_distutils_sysconfig_py b/package/python2/files/patch-Lib_distutils_sysconfig_py
new file mode 100644
index 000000000..cbd51020d
--- /dev/null
+++ b/package/python2/files/patch-Lib_distutils_sysconfig_py
@@ -0,0 +1,10 @@
+--- Lib.orig/distutils/sysconfig.py 2013-05-12 05:32:42.000000000 +0200
++++ Lib/distutils/sysconfig.py 2013-11-03 18:03:53.000000000 +0100
+@@ -76,6 +76,7 @@ def get_python_inc(plat_specific=0, pref
+ """
+ if prefix is None:
+ prefix = plat_specific and EXEC_PREFIX or PREFIX
++ prefix = re.sub('@@STAGING_HOST_DIR@@', '@@STAGING_TARGET_DIR@@', prefix)
+
+ if os.name == "posix":
+ if python_build:
diff --git a/package/python2/files/python-config.patch b/package/python2/files/python-config.patch
index 9478835d5..0a6ff7145 100644
--- a/package/python2/files/python-config.patch
+++ b/package/python2/files/python-config.patch
@@ -14,8 +14,8 @@
elif opt in ('--includes', '--cflags'):
- flags = ['-I' + sysconfig.get_python_inc(),
- '-I' + sysconfig.get_python_inc(plat_specific=True)]
-+ flags = ['-I' + re.sub('target_', 'host_', sysconfig.get_python_inc()),
-+ '-I' + re.sub('target_', 'host_', sysconfig.get_python_inc(plat_specific=True))]
++ flags = ['-I' + re.sub('@@STAGING_TARGET_DIR@@', '@@STAGING_HOST_DIR@@', sysconfig.get_python_inc()),
++ '-I' + re.sub('@@STAGING_TARGET_DIR@@', '@@STAGING_HOST_DIR@@', sysconfig.get_python_inc(plat_specific=True))]
if opt == '--cflags':
flags.extend(getvar('CFLAGS').split())
print ' '.join(flags)
diff --git a/package/python2/patches/patch-Lib_distutils_sysconfig_py b/package/python2/patches/patch-Lib_distutils_sysconfig_py
deleted file mode 100644
index 30aae0816..000000000
--- a/package/python2/patches/patch-Lib_distutils_sysconfig_py
+++ /dev/null
@@ -1,10 +0,0 @@
---- Python-2.7.5.orig/Lib/distutils/sysconfig.py 2013-05-12 05:32:42.000000000 +0200
-+++ Python-2.7.5/Lib/distutils/sysconfig.py 2013-11-03 18:03:53.000000000 +0100
-@@ -76,6 +76,7 @@ def get_python_inc(plat_specific=0, pref
- """
- if prefix is None:
- prefix = plat_specific and EXEC_PREFIX or PREFIX
-+ prefix = re.sub('host_', 'target_', prefix)
-
- if os.name == "posix":
- if python_build:
diff --git a/package/resource-agents/Makefile b/package/resource-agents/Makefile
index bed24d4c0..2c4a365b5 100644
--- a/package/resource-agents/Makefile
+++ b/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
diff --git a/package/rng-tools/Makefile b/package/rng-tools/Makefile
index 465f406a2..26ad29821 100644
--- a/package/rng-tools/Makefile
+++ b/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
diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile
index 75ed5fee9..b774370e2 100644
--- a/package/rp-pppoe/Makefile
+++ b/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
diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile
index 7a8bdb15f..655bd3965 100644
--- a/package/rpcbind/Makefile
+++ b/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
diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile
index 95d3b28b1..1bbd888b2 100644
--- a/package/scanlogd/Makefile
+++ b/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
diff --git a/package/snort/Makefile b/package/snort/Makefile
index 07f333207..4427a1297 100644
--- a/package/snort/Makefile
+++ b/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
diff --git a/package/socat/Makefile b/package/socat/Makefile
index 9f9d6d701..4969a6d85 100644
--- a/package/socat/Makefile
+++ b/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/
diff --git a/package/squeezelite/Makefile b/package/squeezelite/Makefile
index aee2b2b70..8792f5410 100644
--- a/package/squeezelite/Makefile
+++ b/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
diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile
index 770268518..607f9a610 100644
--- a/package/ssltunnel/Makefile
+++ b/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
diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile
index f645ff403..b60c6e6d7 100644
--- a/package/strongswan/Makefile
+++ b/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
diff --git a/package/syslinux/patches/patch-com32_cmenu_complex_c32 b/package/syslinux/patches/patch-com32_cmenu_complex_c32
deleted file mode 100644
index ce7a13776..000000000
--- a/package/syslinux/patches/patch-com32_cmenu_complex_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_cmenu_display_c32 b/package/syslinux/patches/patch-com32_cmenu_display_c32
deleted file mode 100644
index 686aac0b4..000000000
--- a/package/syslinux/patches/patch-com32_cmenu_display_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_cmenu_simple_c32 b/package/syslinux/patches/patch-com32_cmenu_simple_c32
deleted file mode 100644
index 82ceb24e8..000000000
--- a/package/syslinux/patches/patch-com32_cmenu_simple_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_cmenu_test2_c32 b/package/syslinux/patches/patch-com32_cmenu_test2_c32
deleted file mode 100644
index ee201edd4..000000000
--- a/package/syslinux/patches/patch-com32_cmenu_test2_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_cmenu_test_c32 b/package/syslinux/patches/patch-com32_cmenu_test_c32
deleted file mode 100644
index c1673c4fa..000000000
--- a/package/syslinux/patches/patch-com32_cmenu_test_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_gfxboot_gfxboot_c32 b/package/syslinux/patches/patch-com32_gfxboot_gfxboot_c32
deleted file mode 100644
index 36dcebf12..000000000
--- a/package/syslinux/patches/patch-com32_gfxboot_gfxboot_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_hdt_hdt_c32 b/package/syslinux/patches/patch-com32_hdt_hdt_c32
deleted file mode 100644
index ddc934500..000000000
--- a/package/syslinux/patches/patch-com32_hdt_hdt_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_libutil_libutil_com_a b/package/syslinux/patches/patch-com32_libutil_libutil_com_a
deleted file mode 100644
index 850f1eafc..000000000
--- a/package/syslinux/patches/patch-com32_libutil_libutil_com_a
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_libutil_libutil_lnx_a b/package/syslinux/patches/patch-com32_libutil_libutil_lnx_a
deleted file mode 100644
index a4f01a321..000000000
--- a/package/syslinux/patches/patch-com32_libutil_libutil_lnx_a
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_lua_src_lua_c32 b/package/syslinux/patches/patch-com32_lua_src_lua_c32
deleted file mode 100644
index 015aa7d00..000000000
--- a/package/syslinux/patches/patch-com32_lua_src_lua_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_mboot_mboot_c32 b/package/syslinux/patches/patch-com32_mboot_mboot_c32
deleted file mode 100644
index e7263f792..000000000
--- a/package/syslinux/patches/patch-com32_mboot_mboot_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_menu_menu_c32 b/package/syslinux/patches/patch-com32_menu_menu_c32
deleted file mode 100644
index 667de4f2d..000000000
--- a/package/syslinux/patches/patch-com32_menu_menu_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_menu_vesamenu_c32 b/package/syslinux/patches/patch-com32_menu_vesamenu_c32
deleted file mode 100644
index ad02006a1..000000000
--- a/package/syslinux/patches/patch-com32_menu_vesamenu_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_cat_c32 b/package/syslinux/patches/patch-com32_modules_cat_c32
deleted file mode 100644
index 5d2d85cdd..000000000
--- a/package/syslinux/patches/patch-com32_modules_cat_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_chain_c32 b/package/syslinux/patches/patch-com32_modules_chain_c32
deleted file mode 100644
index 7fd7990fa..000000000
--- a/package/syslinux/patches/patch-com32_modules_chain_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_cmd_c32 b/package/syslinux/patches/patch-com32_modules_cmd_c32
deleted file mode 100644
index 28a8193bf..000000000
--- a/package/syslinux/patches/patch-com32_modules_cmd_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_config_c32 b/package/syslinux/patches/patch-com32_modules_config_c32
deleted file mode 100644
index 231bb1594..000000000
--- a/package/syslinux/patches/patch-com32_modules_config_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_cpuid_c32 b/package/syslinux/patches/patch-com32_modules_cpuid_c32
deleted file mode 100644
index 07ceaae67..000000000
--- a/package/syslinux/patches/patch-com32_modules_cpuid_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_cpuidtest_c32 b/package/syslinux/patches/patch-com32_modules_cpuidtest_c32
deleted file mode 100644
index 9409d12e1..000000000
--- a/package/syslinux/patches/patch-com32_modules_cpuidtest_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_disk_c32 b/package/syslinux/patches/patch-com32_modules_disk_c32
deleted file mode 100644
index 2f4f85d0c..000000000
--- a/package/syslinux/patches/patch-com32_modules_disk_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_dmitest_c32 b/package/syslinux/patches/patch-com32_modules_dmitest_c32
deleted file mode 100644
index 2e667b9fc..000000000
--- a/package/syslinux/patches/patch-com32_modules_dmitest_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_elf_c32 b/package/syslinux/patches/patch-com32_modules_elf_c32
deleted file mode 100644
index 27b88dc15..000000000
--- a/package/syslinux/patches/patch-com32_modules_elf_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_ethersel_c32 b/package/syslinux/patches/patch-com32_modules_ethersel_c32
deleted file mode 100644
index 95f1650ac..000000000
--- a/package/syslinux/patches/patch-com32_modules_ethersel_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_gpxecmd_c32 b/package/syslinux/patches/patch-com32_modules_gpxecmd_c32
deleted file mode 100644
index 35b0c7d1e..000000000
--- a/package/syslinux/patches/patch-com32_modules_gpxecmd_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_host_c32 b/package/syslinux/patches/patch-com32_modules_host_c32
deleted file mode 100644
index 1593366ea..000000000
--- a/package/syslinux/patches/patch-com32_modules_host_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_ifcpu64_c32 b/package/syslinux/patches/patch-com32_modules_ifcpu64_c32
deleted file mode 100644
index 8b193ed54..000000000
--- a/package/syslinux/patches/patch-com32_modules_ifcpu64_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_ifcpu_c32 b/package/syslinux/patches/patch-com32_modules_ifcpu_c32
deleted file mode 100644
index 4a2382717..000000000
--- a/package/syslinux/patches/patch-com32_modules_ifcpu_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_ifplop_c32 b/package/syslinux/patches/patch-com32_modules_ifplop_c32
deleted file mode 100644
index cc379a00b..000000000
--- a/package/syslinux/patches/patch-com32_modules_ifplop_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_kbdmap_c32 b/package/syslinux/patches/patch-com32_modules_kbdmap_c32
deleted file mode 100644
index 88510ffde..000000000
--- a/package/syslinux/patches/patch-com32_modules_kbdmap_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_linux_c32 b/package/syslinux/patches/patch-com32_modules_linux_c32
deleted file mode 100644
index 2fd270f90..000000000
--- a/package/syslinux/patches/patch-com32_modules_linux_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_ls_c32 b/package/syslinux/patches/patch-com32_modules_ls_c32
deleted file mode 100644
index 1cf11f7e8..000000000
--- a/package/syslinux/patches/patch-com32_modules_ls_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_meminfo_c32 b/package/syslinux/patches/patch-com32_modules_meminfo_c32
deleted file mode 100644
index 4f8a803ac..000000000
--- a/package/syslinux/patches/patch-com32_modules_meminfo_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_pcitest_c32 b/package/syslinux/patches/patch-com32_modules_pcitest_c32
deleted file mode 100644
index b88ce546e..000000000
--- a/package/syslinux/patches/patch-com32_modules_pcitest_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_pmload_c32 b/package/syslinux/patches/patch-com32_modules_pmload_c32
deleted file mode 100644
index a178c141f..000000000
--- a/package/syslinux/patches/patch-com32_modules_pmload_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_pwd_c32 b/package/syslinux/patches/patch-com32_modules_pwd_c32
deleted file mode 100644
index 36273414e..000000000
--- a/package/syslinux/patches/patch-com32_modules_pwd_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_sanboot_c32 b/package/syslinux/patches/patch-com32_modules_sanboot_c32
deleted file mode 100644
index bfa90d7d9..000000000
--- a/package/syslinux/patches/patch-com32_modules_sanboot_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_sdi_c32 b/package/syslinux/patches/patch-com32_modules_sdi_c32
deleted file mode 100644
index afbc5e158..000000000
--- a/package/syslinux/patches/patch-com32_modules_sdi_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_vesainfo_c32 b/package/syslinux/patches/patch-com32_modules_vesainfo_c32
deleted file mode 100644
index 8b82a0117..000000000
--- a/package/syslinux/patches/patch-com32_modules_vesainfo_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_vpdtest_c32 b/package/syslinux/patches/patch-com32_modules_vpdtest_c32
deleted file mode 100644
index 034904a4b..000000000
--- a/package/syslinux/patches/patch-com32_modules_vpdtest_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_modules_whichsys_c32 b/package/syslinux/patches/patch-com32_modules_whichsys_c32
deleted file mode 100644
index 86a3aa625..000000000
--- a/package/syslinux/patches/patch-com32_modules_whichsys_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_rosh_rosh_c32 b/package/syslinux/patches/patch-com32_rosh_rosh_c32
deleted file mode 100644
index f4a1033a0..000000000
--- a/package/syslinux/patches/patch-com32_rosh_rosh_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_samples_advdump_c32 b/package/syslinux/patches/patch-com32_samples_advdump_c32
deleted file mode 100644
index 996dfeb5e..000000000
--- a/package/syslinux/patches/patch-com32_samples_advdump_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_samples_entrydump_c32 b/package/syslinux/patches/patch-com32_samples_entrydump_c32
deleted file mode 100644
index 1e11bcc99..000000000
--- a/package/syslinux/patches/patch-com32_samples_entrydump_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_samples_fancyhello_c32 b/package/syslinux/patches/patch-com32_samples_fancyhello_c32
deleted file mode 100644
index cf57e59b7..000000000
--- a/package/syslinux/patches/patch-com32_samples_fancyhello_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_samples_fancyhello_lnx b/package/syslinux/patches/patch-com32_samples_fancyhello_lnx
deleted file mode 100644
index 4c48644ee..000000000
--- a/package/syslinux/patches/patch-com32_samples_fancyhello_lnx
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_samples_hello_c32 b/package/syslinux/patches/patch-com32_samples_hello_c32
deleted file mode 100644
index 90db9bc3f..000000000
--- a/package/syslinux/patches/patch-com32_samples_hello_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_samples_keytest_c32 b/package/syslinux/patches/patch-com32_samples_keytest_c32
deleted file mode 100644
index cbe089765..000000000
--- a/package/syslinux/patches/patch-com32_samples_keytest_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_samples_keytest_lnx b/package/syslinux/patches/patch-com32_samples_keytest_lnx
deleted file mode 100644
index dbdf4080a..000000000
--- a/package/syslinux/patches/patch-com32_samples_keytest_lnx
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_samples_resolv_c32 b/package/syslinux/patches/patch-com32_samples_resolv_c32
deleted file mode 100644
index 2351b270f..000000000
--- a/package/syslinux/patches/patch-com32_samples_resolv_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_samples_serialinfo_c32 b/package/syslinux/patches/patch-com32_samples_serialinfo_c32
deleted file mode 100644
index 920ca3fa3..000000000
--- a/package/syslinux/patches/patch-com32_samples_serialinfo_c32
+++ /dev/null
Binary files differ
diff --git a/package/syslinux/patches/patch-com32_sysdump_sysdump_c32 b/package/syslinux/patches/patch-com32_sysdump_sysdump_c32
deleted file mode 100644
index 340637da4..000000000
--- a/package/syslinux/patches/patch-com32_sysdump_sysdump_c32
+++ /dev/null
Binary files differ
diff --git a/package/traceroute/Makefile b/package/traceroute/Makefile
index 64f1e1a48..d9adf24cd 100644
--- a/package/traceroute/Makefile
+++ b/package/traceroute/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= net
PKG_URL:= http://traceroute.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=traceroute/}
-PKG_LIBC_DEPENDS:= eglibc glibc musl
+PKG_LIBC_DEPENDS:= glibc musl
include $(TOPDIR)/mk/package.mk
diff --git a/package/v4l-utils/Makefile b/package/v4l-utils/Makefile
index f4879acdd..64e500858 100644
--- a/package/v4l-utils/Makefile
+++ b/package/v4l-utils/Makefile
@@ -16,7 +16,7 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-PKG_LIBC_DEPENDS:= eglibc glibc
+PKG_LIBC_DEPENDS:= glibc
PKG_SUBPKGS:= V4L_UTILS LIBV4L
PKGSC_LIBV4L:= libs
PKGSD_LIBV4L:= Video4Linux2 libraries
diff --git a/package/vlc/Makefile b/package/vlc/Makefile
index cab09241a..67f0ec763 100644
--- a/package/vlc/Makefile
+++ b/package/vlc/Makefile
@@ -15,7 +15,7 @@ PKG_URL:= http://www.videolan.org/vlc/
PKG_SITES:= http://download.videolan.org/pub/videolan/vlc/$(PKG_VERSION)/
PKG_ARCH_DEPENDS:= !m68k
-PKG_LIBC_DEPENDS:= eglibc glibc musl
+PKG_LIBC_DEPENDS:= glibc musl
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index e97138945..282cf88fb 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -33,7 +33,7 @@ PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc omxplayer
PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc omxplayer
PKG_BUILDDEP_IBM_X40:= nasm-host
PKG_SYSTEM_DEPENDS:= raspberry-pi ibm-x40
-PKG_LIBC_DEPENDS:= eglibc glibc
+PKG_LIBC_DEPENDS:= glibc
WRKDIST= $(WRKDIR)/$(PKG_NAME)-$(PKG_VERSION)-Frodo
diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
index d2b28285b..b8311198a 100644
--- a/package/xf86-input-evdev/Makefile
+++ b/package/xf86-input-evdev/Makefile
@@ -13,7 +13,7 @@ PKG_DEPENDS:= xorg-server kmod-input-evdev libudev
PKG_BUILDDEP:= xorg-server eudev
PKG_SITES:= ${MASTER_SITE_XORG}
-PKG_LIBC_DEPENDS:= eglibc glibc
+PKG_LIBC_DEPENDS:= glibc
PKG_ARCH_DEPENDS:= !m68k
PKG_CFLINE_XF86_INPUT_EVDEV:= depends on ADK_TARGET_WITH_INPUT
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index ceb1f82e1..78e30a09a 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -15,7 +15,7 @@ PKG_URL:= http://oss.sgi.com/projects/xfs
PKG_SITES:= ftp://oss.sgi.com/projects/xfs/cmd_tars/ \
ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/
-PKG_LIBC_DEPENDS:= eglibc glibc
+PKG_LIBC_DEPENDS:= glibc
PKG_TARGET_DEPENDS:= !atmel-ngw100
include ${TOPDIR}/mk/package.mk
diff --git a/target/arm/sys-available/keyasic-ka2000 b/target/arm/sys-available/keyasic-ka2000
index 3c9573ebe..36434269c 100644
--- a/target/arm/sys-available/keyasic-ka2000
+++ b/target/arm/sys-available/keyasic-ka2000
@@ -7,8 +7,8 @@ config ADK_TARGET_SYSTEM_KEYASIC_KA2000
select ADK_EABI
select ADK_CPU_ARM926EJ_S
select ADK_TOOLCHAIN
- select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_MUSL
- select BUSYBOX_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_MUSL
+ select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL
+ select BUSYBOX_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL
help
KeyASIC KA2000 aka Transcend WifiSD.
Build a toolchain only and make all binaries static.
diff --git a/target/config/Config.in b/target/config/Config.in
index 2982fd088..c8e566cc8 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -622,9 +622,6 @@ config ADK_TARGET_CMDLINE
config ADK_uclibc
boolean
-config ADK_eglibc
- boolean
-
config ADK_glibc
boolean
@@ -637,7 +634,6 @@ config ADK_libc
config ADK_TARGET_LIBC
string
default "uclibc" if ADK_uclibc
- default "eglibc" if ADK_eglibc
default "glibc" if ADK_glibc
default "musl" if ADK_musl
default "libc" if ADK_libc
@@ -659,27 +655,6 @@ config ADK_TARGET_LIB_UCLIBC
help
http://uclibc.org
-config ADK_TARGET_LIB_EGLIBC
- prompt "Embedded GNU C library"
- boolean
- select ADK_eglibc
- select ADK_HOST_NEED_GPERF
- depends on \
- ADK_LINUX_ARM || \
- ADK_LINUX_ARMEB || \
- ADK_LINUX_M68K || \
- ADK_LINUX_MICROBLAZE || \
- ADK_LINUX_MIPS || \
- ADK_LINUX_PPC || \
- ADK_LINUX_PPC64 || \
- ADK_LINUX_SH || \
- ADK_LINUX_SPARC || \
- ADK_LINUX_SPARC64 || \
- ADK_LINUX_X86 || \
- ADK_LINUX_X86_64
- help
- http://www.eglibc.org
-
config ADK_TARGET_LIB_GLIBC
prompt "GNU C library"
boolean
@@ -725,27 +700,30 @@ endchoice
config ADK_TARGET_SUFFIX
string
- default "gnueabihf" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_EABIHF
- default "gnueabi" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_EABI
- default "gnuabi64" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_n64
- default "gnuabin32" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_n32
- default "gnuabi32" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_o32
- default "gnu" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && !ADK_EABI
+ default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_EABIHF
+ default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_EABI
+ default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_n64 && ADK_TARGET_KERNEL64
+ default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_n32 && ADK_TARGET_KERNEL64
+ default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_o32 && ADK_TARGET_KERNEL64
+ default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_32 && ADK_TARGET_KERNEL64
+ default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_x32 && ADK_TARGET_KERNEL64
+ default "gnu" if ADK_TARGET_LIB_GLIBC
default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_EABIHF
default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_EABI
- default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64
- default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32
- default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32
- default "uclibc" if ADK_TARGET_LIB_UCLIBC && !ADK_EABI
+ default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64 && ADK_TARGET_KERNEL64
+ default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32 && ADK_TARGET_KERNEL64
+ default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32 && ADK_TARGET_KERNEL64
+ default "uclibc32" if ADK_TARGET_LIB_UCLIBC && ADK_32 && ADK_TARGET_KERNEL64
+ default "uclibcx32" if ADK_TARGET_LIB_UCLIBC && ADK_x32 && ADK_TARGET_KERNEL64
+ default "uclibc" if ADK_TARGET_LIB_UCLIBC
default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_EABIHF
default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_EABI
- default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64
- default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32
- default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32
+ default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64 && ADK_TARGET_KERNEL64
+ default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32 && ADK_TARGET_KERNEL64
+ default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32 && ADK_TARGET_KERNEL64
+ default "musl32" if ADK_TARGET_LIB_MUSL && ADK_32 && ADK_TARGET_KERNEL64
+ default "muslx32" if ADK_TARGET_LIB_MUSL && ADK_x32 && ADK_TARGET_KERNEL64
default "musl" if ADK_TARGET_LIB_MUSL
- default "32" if ADK_32
- default "x32" if ADK_x32
- default "gnu"
choice
prompt "Target firmware type"
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index cf92eadee..d863179b8 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -6,10 +6,6 @@ config ADK_HOST_NEED_SYSLINUX
boolean
default n
-config ADK_HOST_NEED_GPERF
- boolean
- default n
-
config ADK_HOST_NEED_SQUASHFS
boolean
default n
diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development
index 6da3a5564..b4a9bff9f 100644
--- a/target/packages/pkg-available/development
+++ b/target/packages/pkg-available/development
@@ -13,7 +13,6 @@ config ADK_PKG_DEVELOPMENT
select ADK_PACKAGE_TAR
select ADK_PACKAGE_MUSL_DEV if ADK_TARGET_LIB_MUSL
select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC
- select ADK_PACKAGE_EGLIBC_DEV if ADK_TARGET_LIB_EGLIBC
select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
select ADK_PACKAGE_LIBNCURSES
select ADK_PACKAGE_LIBNCURSES_DEV
diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test
new file mode 100644
index 000000000..8af24a816
--- /dev/null
+++ b/target/packages/pkg-available/test
@@ -0,0 +1,8 @@
+config ADK_PKG_TEST
+ bool "Compile a ADK test framework system"
+ default n
+ select ADK_PACKAGE_STRACE
+ select ADK_PACKAGE_SOCAT
+ help
+ Package collection used to build adk-test-framework root
+ filesystem.
diff --git a/toolchain/Makefile b/toolchain/Makefile
index 460cbf97f..db5f65fd5 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -10,7 +10,7 @@
# 6) build and install initial static gcc
# 7) build and install full libc
# 8) build and install full shared gcc
-# 9) rebuild and install full libc (in case of musl)
+# 9) rebuild and install full libc (in case of musl/uclibc)
# 10) build and install gdb debugger
include $(TOPDIR)/rules.mk
@@ -20,10 +20,6 @@ ifeq ($(ADK_TARGET_LIB_GLIBC),y)
TARGETS+=glibc
LIBC:=glibc
endif
-ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
-TARGETS+=eglibc
-LIBC:=eglibc
-endif
ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
TARGETS+=uClibc
LIBC:=uClibc
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
deleted file mode 100644
index 20b6f33ac..000000000
--- a/toolchain/eglibc/Makefile
+++ /dev/null
@@ -1,99 +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 ../rules.mk
-
-# eglibc does not compile with Os on some architectures
-ifeq ($(ADK_LINUX_SPARC),y)
-TARGET_CFLAGS_LIBC:= $(subst Os,O2,$(TARGET_CFLAGS))
-endif
-ifeq ($(ADK_LINUX_MICROBLAZE),y)
-TARGET_CFLAGS_LIBC:= $(subst Os,O2,$(TARGET_CFLAGS))
-endif
-ifeq ($(ADK_LINUX_PPC64),y)
-TARGET_CFLAGS_LIBC:= $(subst Os,O2,$(TARGET_CFLAGS))
-endif
-
-# ssp not supported
-TARGET_CFLAGS_LIBC:= $(filter-out -fstack-protector,$(TARGET_CFLAGS_LIBC))
-
-include Makefile.inc
-include ${TOPDIR}/mk/buildhlp.mk
-
-EGLIBC_BUILD_DIR_INITIAL:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-headers
-EGLIBC_BUILD_DIR_FINAL:= ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final
-
-$(WRKBUILD)/.headers_configure:
- mkdir -p $(EGLIBC_BUILD_DIR_INITIAL)
- $(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \
- $(WRKBUILD)/libc/option-groups.config
- (cd $(EGLIBC_BUILD_DIR_INITIAL); \
- ${EGLIBC_ENV} \
- CC="${GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \
- $(WRKBUILD)/libc/configure \
- --prefix=$(STAGING_TARGET_DIR)/usr \
- --with-headers=$(STAGING_TARGET_DIR)/usr/include \
- --host=$(GNU_TARGET_NAME) \
- ${EGLIBC_CONFOPTS} \
- );
- touch $@
-
-$(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
- (cd $(EGLIBC_BUILD_DIR_INITIAL); \
- ${EGLIBC_ENV} \
- CC="${GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \
- $(MAKE) install-headers install-bootstrap-headers=yes cross-compiling=yes \
- );
- touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
- touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,o32,n32,soft,hard}.h
- touch $@
-
-ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
-EGLIBC_ENV+= libc_cv_ssp=yes
-else
-EGLIBC_ENV+= libc_cv_ssp=no
-endif
-
-$(WRKBUILD)/.configured:
- mkdir -p $(EGLIBC_BUILD_DIR_FINAL)
- $(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \
- $(EGLIBC_BUILD_DIR_FINAL)/option-groups.config
- (cd $(EGLIBC_BUILD_DIR_FINAL); \
- ${EGLIBC_ENV} \
- CC="${GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \
- $(WRKBUILD)/libc/configure \
- --prefix=/usr \
- --enable-shared \
- --enable-stackguard-randomization \
- --host=$(GNU_TARGET_NAME) \
- ${EGLIBC_CONFOPTS} \
- );
- touch $@
-
-$(EGLIBC_BUILD_DIR_FINAL)/libc.so:
-$(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
- ${EGLIBC_ENV} \
- CC="${GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \
- $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) cross-compiling=yes all
- touch $@
-
-$(WRKBUILD)/.installed: $(EGLIBC_BUILD_DIR_FINAL)/libc.so
- ${EGLIBC_ENV} \
- CC="${GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \
- $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) install_root=$(STAGING_TARGET_DIR) install
- ${INSTALL_DIR} ${STAGING_TARGET_DIR}/etc
- ${INSTALL_DATA} ${WRKBUILD}/libc/posix/gai.conf ${STAGING_TARGET_DIR}/etc/
- ${INSTALL_DATA} ${WRKBUILD}/libc/nss/nsswitch.conf ${STAGING_TARGET_DIR}/etc/
- touch $@
-
-$(WRKBUILD)/.fixup:
- -find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete
- -find $(STAGING_TARGET_DIR) -type -f -name \*_pic\* -delete
- rm -rf $(STAGING_TARGET_DIR)/usr/share/locale $(STAGING_TARGET_DIR)/usr/share/i18n
- rm -rf $(STAGING_TARGET_DIR)/usr/lib/gconv
- PATH="$(TARGET_PATH)" debug='' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR)
- debug='' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)
- touch $@
-
-include ${TOPDIR}/mk/toolchain.mk
diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc
deleted file mode 100644
index 7213a45c3..000000000
--- a/toolchain/eglibc/Makefile.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-PKG_NAME:= eglibc
-PKG_VERSION:= 2.19
-PKG_RELEASE:= 1
-PKG_MD5SUM:= b54dfce017ee3132f7b2a8d8f46067cf
-PKG_SITES:= http://openadk.org/distfiles/
-EGLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \
- --without-cvs \
- --disable-profile \
- --disable-debug \
- --enable-kernel=2.6.32 \
- --without-gd \
- --disable-nscd \
- --with-__thread \
- --with-tls \
- --disable-obsolete-rpc \
- --enable-add-ons \
- --disable-nls
-EGLIBC_ENV:= PATH='${TARGET_PATH}' \
- BUILD_CC=${CC_FOR_BUILD} \
- GCC_HONOUR_COPTS=s \
- CFLAGS="$(TARGET_CFLAGS_LIBC)" \
- CC=${GNU_TARGET_NAME}-gcc \
- CXX=${GNU_TARGET_NAME}-g++ \
- AR=${GNU_TARGET_NAME}-ar \
- RANLIB=${GNU_TARGET_NAME}-ranlib \
- libc_cv_cc_with_libunwind=no \
- libc_cv_forced_unwind=yes \
- libc_cv_c_cleanup=yes \
- libc_cv_gnu99_inline=yes \
- libc_cv_initfini_array=yes \
- libc_cv_slibdir="/lib"
diff --git a/toolchain/eglibc/eglibc.config b/toolchain/eglibc/eglibc.config
deleted file mode 100644
index f0304ff85..000000000
--- a/toolchain/eglibc/eglibc.config
+++ /dev/null
@@ -1,47 +0,0 @@
-# This file sets default values for all option group variables
-# mentioned in option-groups.def; see that file for a description of
-# each option group.
-#
-# Subdirectory makefiles include this file before including the user's
-# settings from option-groups.config at the top of the build tree;
-# that file need only refer to those options whose default settings
-# are to be changed.
-#
-# By default, all option groups are enabled.
-OPTION_EGLIBC_ADVANCED_INET6 = y
-OPTION_EGLIBC_BACKTRACE = y
-OPTION_EGLIBC_BIG_MACROS = y
-OPTION_EGLIBC_BSD = y
-OPTION_EGLIBC_CXX_TESTS = n
-OPTION_EGLIBC_CATGETS = y
-OPTION_EGLIBC_CHARSETS = n
-OPTION_EGLIBC_CRYPT = y
-OPTION_EGLIBC_CRYPT_UFC = y
-OPTION_EGLIBC_DB_ALIASES = n
-OPTION_EGLIBC_ENVZ = y
-OPTION_EGLIBC_FCVT = y
-OPTION_EGLIBC_FMTMSG = y
-OPTION_EGLIBC_FSTAB = y
-OPTION_EGLIBC_FTRAVERSE = y
-OPTION_EGLIBC_GETLOGIN = y
-OPTION_EGLIBC_IDN = n
-OPTION_EGLIBC_INET = y
-OPTION_EGLIBC_INET_ANL = y
-OPTION_EGLIBC_LIBM = y
-OPTION_EGLIBC_LOCALES = y
-OPTION_EGLIBC_LOCALE_CODE = y
-OPTION_EGLIBC_MEMUSAGE = y
-OPTION_EGLIBC_NIS = n
-OPTION_EGLIBC_NSSWITCH = y
-OPTION_EGLIBC_RCMD = y
-OPTION_EGLIBC_RTLD_DEBUG = y
-OPTION_EGLIBC_SPAWN = y
-OPTION_EGLIBC_STREAMS = y
-OPTION_EGLIBC_SUNRPC = n
-OPTION_EGLIBC_UTMP = y
-OPTION_EGLIBC_UTMPX = y
-OPTION_EGLIBC_WORDEXP = y
-OPTION_POSIX_C_LANG_WIDE_CHAR = y
-OPTION_POSIX_REGEXP = y
-OPTION_POSIX_REGEXP_GLIBC = y
-OPTION_POSIX_WIDE_CHAR_DEVICE_IO = y
diff --git a/toolchain/eglibc/patches/cygwin.patch b/toolchain/eglibc/patches/cygwin.patch
deleted file mode 100644
index 647d27a25..000000000
--- a/toolchain/eglibc/patches/cygwin.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Nur eglibc-2.17.orig/libc/ports/sysdeps/arm/nptl/pthread_spin_lock.c eglibc-2.17/libc/ports/sysdeps/arm/nptl/pthread_spin_lock.c
---- eglibc-2.17.orig/libc/ports/sysdeps/arm/nptl/pthread_spin_lock.c 2013-05-08 14:27:27.000000000 +0200
-+++ eglibc-2.17/libc/ports/sysdeps/arm/nptl/pthread_spin_lock.c 2013-07-10 12:48:57.000000000 +0200
-@@ -20,4 +20,4 @@
- /* We can't use the normal "#include <nptl/pthread_spin_lock.c>" because
- it will resolve to this very file. Using "sysdeps/.." as reference to the
- top level directory does the job. */
--#include <sysdeps/../nptl/pthread_spin_lock.c>
-+#include <../sysdeps/../nptl/pthread_spin_lock.c>
diff --git a/toolchain/eglibc/patches/eglibc-cross.patch b/toolchain/eglibc/patches/eglibc-cross.patch
deleted file mode 100644
index 6d74ec327..000000000
--- a/toolchain/eglibc/patches/eglibc-cross.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -Nur eglibc-2.18.orig/libc/sunrpc/rpc/types.h eglibc-2.18/libc/sunrpc/rpc/types.h
---- eglibc-2.18.orig/libc/sunrpc/rpc/types.h 2013-09-13 10:20:22.000000000 +0200
-+++ eglibc-2.18/libc/sunrpc/rpc/types.h 2014-01-25 13:23:20.000000000 +0100
-@@ -70,6 +70,7 @@
- #endif
-
- #ifndef __u_char_defined
-+#if !defined(__APPLE__) && !defined(__BSD__)
- typedef __u_char u_char;
- typedef __u_short u_short;
- typedef __u_int u_int;
-@@ -79,11 +80,14 @@
- typedef __fsid_t fsid_t;
- # define __u_char_defined
- #endif
-+#endif
- #ifndef __daddr_t_defined
-+#if !defined(__APPLE__) && !defined(__BSD__)
- typedef __daddr_t daddr_t;
- typedef __caddr_t caddr_t;
- # define __daddr_t_defined
- #endif
-+#endif
-
- #include <sys/time.h>
- #include <sys/param.h>
-diff -Nur eglibc-2.18.orig/libc/sunrpc/rpc_main.c eglibc-2.18/libc/sunrpc/rpc_main.c
---- eglibc-2.18.orig/libc/sunrpc/rpc_main.c 2013-09-13 10:20:22.000000000 +0200
-+++ eglibc-2.18/libc/sunrpc/rpc_main.c 2014-01-25 09:57:31.000000000 +0100
-@@ -38,7 +38,6 @@
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
--#include <libintl.h>
- #include <locale.h>
- #include <ctype.h>
- #include <sys/types.h>
-@@ -51,6 +50,8 @@
- #include "rpc_scan.h"
- #include "proto.h"
-
-+#define gettext(X) (X)
-+
- #include "../version.h"
- #define PACKAGE _libc_intl_domainname
-
-@@ -958,10 +959,12 @@
- abort ();
- temp = rindex (cmd->infile, '.');
- cp = stpcpy (mkfilename, "Makefile.");
-- if (temp != NULL)
-- *((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0';
-- else
-+ if (temp != NULL) {
-+ strncpy (cp, cmd->infile, temp - cmd->infile);
-+ cp[temp - cmd->infile - 1] = '\0';
-+ } else {
- stpcpy (cp, cmd->infile);
-+ }
-
- }
- else
-diff -Nur eglibc-2.18.orig/libc/sunrpc/rpc_scan.c eglibc-2.18/libc/sunrpc/rpc_scan.c
---- eglibc-2.18.orig/libc/sunrpc/rpc_scan.c 2013-09-13 10:20:22.000000000 +0200
-+++ eglibc-2.18/libc/sunrpc/rpc_scan.c 2014-01-25 09:57:31.000000000 +0100
-@@ -37,12 +37,13 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <string.h>
--#include <libintl.h>
- #include "rpc_scan.h"
- #include "rpc_parse.h"
- #include "rpc_util.h"
- #include "proto.h"
-
-+#define gettext(X) (X)
-+
- #define startcomment(where) (where[0] == '/' && where[1] == '*')
- #define endcomment(where) (where[-1] == '*' && where[0] == '/')
-
diff --git a/toolchain/eglibc/patches/sparc64.patch b/toolchain/eglibc/patches/sparc64.patch
deleted file mode 100644
index 1fa281a9a..000000000
--- a/toolchain/eglibc/patches/sparc64.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur eglibc-2.12.1.orig/libc/sysdeps/sparc/sparc64/Makefile eglibc-2.12.1/libc/sysdeps/sparc/sparc64/Makefile
---- eglibc-2.12.1.orig/libc/sysdeps/sparc/sparc64/Makefile 2010-09-28 19:13:11.000000000 +0200
-+++ eglibc-2.12.1/libc/sysdeps/sparc/sparc64/Makefile 2011-01-02 12:43:41.009426907 +0100
-@@ -1,3 +1,5 @@
-+sysdep-CFLAGS += -mcpu=v9 -Wa,-Av9a
-+
- ifeq ($(subdir),csu)
- sysdep_routines += hp-timing
- elide-routines.os += hp-timing
-@@ -10,3 +12,11 @@
- ifeq ($(subdir),string)
- sysdep_routines += align-cpy
- endif
-+
-+ASFLAGS-.o += -Wa,-Av9a
-+ASFLAGS-.os += -Wa,-Av9a
-+ASFLAGS-.op += -Wa,-Av9a
-+ASFLAGS-.og += -Wa,-Av9a
-+ASFLAGS-.ob += -Wa,-Av9a
-+ASFLAGS-.oS += -Wa,-Av9a
-+
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index d29778c2e..bbbd3d09c 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -199,12 +199,16 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
# fix linking g++ apps with libtool
@-test -d $(STAGING_TARGET_DIR)/lib32 && \
cd $(STAGING_TARGET_DIR)/lib32 && \
- ln -sf libstdc++.so.6.0.17 libstdc++.so && \
- ln -sf libstdc++.so.6.0.17 libstdc++.so.6
+ ln -sf libstdc++.so.6.0.18 libstdc++.so && \
+ ln -sf libstdc++.so.6.0.18 libstdc++.so.6
+ @-test -d $(STAGING_TARGET_DIR)/libx32 && \
+ cd $(STAGING_TARGET_DIR)/libx32 && \
+ ln -sf libstdc++.so.6.0.18 libstdc++.so && \
+ ln -sf libstdc++.so.6.0.18 libstdc++.so.6
@-test -d $(STAGING_TARGET_DIR)/lib64 && \
cd $(STAGING_TARGET_DIR)/lib64 && \
- ln -sf libstdc++.so.6.0.17 libstdc++.so && \
- ln -sf libstdc++.so.6.0.17 libstdc++.so.6
+ ln -sf libstdc++.so.6.0.18 libstdc++.so && \
+ ln -sf libstdc++.so.6.0.18 libstdc++.so.6
# cleanup unneeded docs
rm -rf $(STAGING_HOST_DIR)/share
touch $@
diff --git a/tools/Makefile b/tools/Makefile
index d40f35f16..2d29372dc 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -17,9 +17,6 @@ endif
ifeq ($(ADK_HOST_NEED_SYSLINUX),y)
TARGETS+=syslinux
endif
-ifeq ($(ADK_HOST_NEED_GPERF),y)
-TARGETS+=gperf
-endif
ifeq ($(ADK_HOST_NEED_JFFS2),y)
TARGETS+=mtd-utils
endif
diff --git a/tools/adk/depmaker.c b/tools/adk/depmaker.c
index f1483cced..572baa392 100644
--- a/tools/adk/depmaker.c
+++ b/tools/adk/depmaker.c
@@ -165,7 +165,7 @@ int main() {
}
/* exclude manual maintained packages from package/Makefile */
- if (!(strncmp(pkgdirp->d_name, "eglibc", 6) == 0) &&
+ if (
!(strncmp(pkgdirp->d_name, "libc", 4) == 0 && strlen(pkgdirp->d_name) == 4) &&
!(strncmp(pkgdirp->d_name, "libpthread", 10) == 0 && strlen(pkgdirp->d_name) == 10) &&
!(strncmp(pkgdirp->d_name, "uclibc++", 8) == 0) &&
diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c
index d2c444f4f..51d31aa70 100644
--- a/tools/adk/pkgmaker.c
+++ b/tools/adk/pkgmaker.c
@@ -394,13 +394,6 @@ int main() {
fprintf(cfg, "\tdepends on ADK_TARGET_LIB_GLIBC\n");
fprintf(cfg, "\thelp\n");
fprintf(cfg, "\t GNU C library header files.\n\n");
- fprintf(cfg, "config ADK_PACKAGE_EGLIBC_DEV\n");
- fprintf(cfg, "\tprompt \"eglibc-dev........... development files for eglibc\"\n");
- fprintf(cfg, "\ttristate\n");
- fprintf(cfg, "\tdefault n\n");
- fprintf(cfg, "\tdepends on ADK_TARGET_LIB_EGLIBC\n");
- fprintf(cfg, "\thelp\n");
- fprintf(cfg, "\t GNU C library header files.\n\n");
fprintf(cfg, "config ADK_PACKAGE_UCLIBC_DEV\n");
fprintf(cfg, "\tprompt \"uclibc-dev........... development files for uclibc\"\n");
fprintf(cfg, "\ttristate\n");
@@ -873,7 +866,7 @@ int main() {
fprintf(cfg, "\nchoice\n");
fprintf(cfg, "prompt \"C++ library to use\"\n");
fprintf(cfg, "depends on ADK_COMPILE_%s\n\n", toupperstr(pkgdirp->d_name));
- fprintf(cfg, "default ADK_COMPILE_%s_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC\n", pkg_cxx);
+ fprintf(cfg, "default ADK_COMPILE_%s_WITH_STDCXX if ADK_TARGET_LIB_GLIBC\n", pkg_cxx);
fprintf(cfg, "default ADK_COMPILE_%s_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC\n\n", pkg_cxx);
fprintf(cfg, "config ADK_COMPILE_%s_WITH_STDCXX\n", pkg_cxx);
fprintf(cfg, "\tbool \"GNU C++ library\"\n");
diff --git a/tools/gperf/Makefile b/tools/gperf/Makefile
deleted file mode 100644
index 7f7d6466d..000000000
--- a/tools/gperf/Makefile
+++ /dev/null
@@ -1,25 +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
-
-PKG_NAME:= gperf
-PKG_VERSION:= 3.0.4
-PKG_RELEASE:= 1
-PKG_MD5SUM:= c1f1db32fb6598d6a93e6e88796a8632
-PKG_SITES:= http://ftp.gnu.org/pub/gnu/gperf/
-
-include ../rules.mk
-
-install: ${STAGING_HOST_DIR}/usr/bin/gperf
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
- (cd ${WRKBUILD}; ./configure)
- ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}'
- touch $@
-
-${STAGING_HOST_DIR}/usr/bin/gperf: $(WRKBUILD)/.compiled
- $(INSTALL_BIN) $(WRKBUILD)/src/gperf \
- ${STAGING_HOST_DIR}/usr/bin
-
-include $(TOPDIR)/mk/tools.mk