get rid of ADK_NATIVE mode, it is not regulary tested and the results where not satisfying.

50 files changed, 23 insertions, 345 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 8efd7becc..3e324789b 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -149,9 +149,6 @@ world:
 	${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
 	${BASH} ${TOPDIR}/scripts/update-sys
 	${BASH} ${TOPDIR}/scripts/update-pkg
-ifeq ($(ADK_NATIVE),y)
-	$(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install
-else
 ifeq ($(ADK_TOOLCHAIN),y)
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
 	$(MAKE) -f mk/build.mk tools/install toolchain/fixup package/compile
@@ -161,7 +158,6 @@ endif
 else
 	$(MAKE) -f mk/build.mk tools/install toolchain/fixup target/config-prepare target/compile package/compile root_clean package/install target/install package_index
 endif
-endif
 
 package_index:
 ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
@@ -349,26 +345,6 @@ endif
 ifneq (,$(filter CYGWIN%,${OStype}))
 	@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/.defconfig
 endif
-ifeq ($(ADKtype),ibm-x40)
-	@echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig
-	@echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/.defconfig
-	@sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
-		target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
-	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
-	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
-endif
-ifeq ($(ADKtype),lemote-yeelong)
-	@echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig
-	@echo ADK_TARGET_SYSTEM_LEMOTE_YEELONG=y >> $(TOPDIR)/.defconfig
-	@sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/mips/sys-available/$(ADKtype) > \
-		target/mips/sys-enabled/.$(ADKtype)
-	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
-	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "source \"target/mips/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
-endif
 	@echo 'source "target/config/Config.in.arch.default"' > target/config/Config.in.arch
 	@echo 'source "target/config/Config.in.arch.choice"' >> target/config/Config.in.arch
 	@echo 'source "target/config/Config.in.system.default"' > target/config/Config.in.system
@@ -439,24 +415,6 @@ endif
 ifneq (,$(filter CYGWIN%,${OStype}))
 	@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/all.config
 endif
-ifeq ($(ADKtype),ibm-x40)
-	@echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/all.config
-	@sed -e "s#TARGET#NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
-		target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
-	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
-	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
-endif
-ifeq ($(ADKtype),lemote-yeelong)
-	@echo ADK_TARGET_SYSTEM_LEMOTE_YEELONG=y >> $(TOPDIR)/all.config
-	@sed -e "s#TARGET#NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
-		target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
-	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
-	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
-	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
-endif
 	@echo 'source "target/config/Config.in.arch.default"' > target/config/Config.in.arch
 	@echo 'source "target/config/Config.in.arch.choice"' >> target/config/Config.in.arch
 	@echo 'source "target/config/Config.in.system.default"' > target/config/Config.in.system
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk
index 0b3e7ddbb..3285e891d 100644
--- a/mk/kernel-vars.mk
+++ b/mk/kernel-vars.mk
@@ -1,13 +1,12 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-KERNEL_MAKE_OPTS:=	-C "${LINUX_DIR}" V=1
-ifneq ($(ADK_NATIVE),y)
-KERNEL_MAKE_OPTS+=	CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
+KERNEL_MAKE_OPTS:=	-C "${LINUX_DIR}" V=1 \
+			CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
 			CC="$(TARGET_CC)" HOSTCC="${CC_FOR_BUILD}" \
 			HOSTCFLAGS='${CFLAGS_FOR_BUILD}' \
 			CONFIG_SHELL='${SHELL}'
-endif
+
 ifeq (${ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G},y)
 ADK_KCPPFLAGS+=		-DBCM47XX_OVERRIDE_FLASHSIZE=0x400000 \
 			-DBCM47XX_OVERRIDE_NVRAMSIZE=0x10000 \
diff --git a/mk/package.mk b/mk/package.mk
index d5d48c1e1..8439d88eb 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -25,13 +25,12 @@ CONFIGURE_ENV+=		GCC_HONOUR_COPTS=s \
 			CXXFLAGS='$(strip ${TARGET_CXXFLAGS})' \
 			CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \
 			LDFLAGS='$(strip ${TARGET_LDFLAGS})' \
-			${HOST_CONFIGURE_OPTS} \
 			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig' \
 			ac_cv_func_realloc_0_nonnull=yes \
-			ac_cv_func_malloc_0_nonnull=yes
-ifeq ($(ADK_NATIVE),)
-CONFIGURE_ENV+=		${TARGET_CONFIGURE_OPTS} cross_compiling=yes
-endif
+			ac_cv_func_malloc_0_nonnull=yes \
+			cross_compiling=yes \
+			${HOST_CONFIGURE_OPTS} \
+			${TARGET_CONFIGURE_OPTS}
 
 CONFIGURE_PROG?=	configure
 MAKE_FILE?=		Makefile
@@ -57,12 +56,8 @@ MAKE_ENV+=		$(GCC_CHECK) \
 			CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \
 			LDFLAGS='$(strip ${TARGET_LDFLAGS})' \
 			${HOST_CONFIGURE_OPTS} \
-			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig'
-ifeq ($(ADK_NATIVE),)
-MAKE_ENV+=		${TARGET_CONFIGURE_OPTS}
-else
-MAKE_ENV+=		M4=m4
-endif
+			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig' \
+			${TARGET_CONFIGURE_OPTS}
 
 MAKE_FLAGS+=		${XAKE_FLAGS} V=1
 FAKE_FLAGS+=		${XAKE_FLAGS}
diff --git a/mk/python.mk b/mk/python.mk
index 1ef92e664..56008760a 100644
--- a/mk/python.mk
+++ b/mk/python.mk
@@ -1,8 +1,3 @@
 PYTHON_VERSION=2.7
-ifeq ($(ADK_NATIVE),)
 PYTHON_LIBDIR:=$(STAGING_HOST_DIR)/usr/lib
 PYTHON:=${STAGING_HOST_DIR}/usr/bin/python
-else
-PYTHON_LIBDIR:=/usr/lib
-PYTHON:=/usr/bin/python
-endif
diff --git a/mk/vars.mk b/mk/vars.mk
index 3798757bc..8f3022634 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -18,11 +18,6 @@ STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_
 STAGING_PKG_DIR_PFX:=	${BASE_DIR}/pkg_*
 STAGING_HOST_DIR:=	${BASE_DIR}/host_${GNU_HOST_NAME}
 STAGING_HOST_DIR_PFX:=	${BASE_DIR}/host_*
-# use headers and foo-config from system
-ifeq ($(ADK_NATIVE),y)
-STAGING_TARGET_DIR:=
-SCRIPT_TARGET_DIR:=	/usr/bin
-else
 ifeq ($(ADK_TARGET_ABI),)
 STAGING_TARGET_DIR:=	${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
 STAGING_DIR:=		${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
@@ -35,7 +30,6 @@ STAGING_HOST2TARGET:=	../target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 endif
 SCRIPT_TARGET_DIR:=	${STAGING_TARGET_DIR}/scripts
-endif
 STAGING_TARGET_DIR_PFX:=${BASE_DIR}/target_*
 TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
 TOOLS_BUILD_DIR=	$(BASE_DIR)/tools_build
@@ -60,15 +54,9 @@ else
 GCC_CHECK:=
 endif
 
-ifeq ($(ADK_NATIVE),y) 
-TARGET_CROSS:=
-TARGET_COMPILER_PREFIX?=
-CONFIGURE_TRIPLE:=	
-else
 TARGET_CROSS:=		$(STAGING_HOST_DIR)/bin/$(GNU_TARGET_NAME)-
 TARGET_COMPILER_PREFIX?=${TARGET_CROSS}
 CONFIGURE_TRIPLE:=	--build=${GNU_HOST_NAME} --host=${GNU_TARGET_NAME} --target=${GNU_TARGET_NAME}
-endif
 
 ifneq ($(strip ${ADK_USE_CCACHE}),)
 TARGET_COMPILER_PREFIX=ccache ${TARGET_CROSS}
@@ -105,12 +93,6 @@ TARGET_LDFLAGS+=	-Wl,--secure-plt
 endif
 endif
 
-ifneq ($(ADK_NATIVE),)
-TARGET_CPPFLAGS:=
-TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
-TARGET_LDFLAGS:=
-endif
-
 ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),)
 TARGET_CFLAGS+=		-fstack-protector
 TARGET_CXXFLAGS+=	-fstack-protector
@@ -198,11 +180,7 @@ PKG_INSTALL:=		PKG_INSTROOT=$(TARGET_DIR) \
 PKG_STATE_DIR:=		$(TARGET_DIR)/usr/lib/pkg
 endif
 
-ifeq ($(ADK_NATIVE),y)
-RSTRIP:=		prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh
-else
 RSTRIP:=		PATH="$(TARGET_PATH)" prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh
-endif
 
 STATCMD:=$(shell if stat -qs .>/dev/null 2>&1; then echo 'stat -f %z';else echo 'stat -c %s';fi)
 	
diff --git a/package/Makefile b/package/Makefile
index eb49efd6a..1b8cc97f3 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -9,26 +9,19 @@ ifeq (${ADK_TARGET_LIB_GLIBC},y)
 package-$(ADK_PACKAGE_GLIBC) += glibc
 gcc-compile: glibc-compile
 endif
+
 ifeq (${ADK_TARGET_LIB_MUSL},y)
 package-$(ADK_PACKAGE_MUSL) += musl
 gcc-compile: musl-compile
 endif
-ifeq (${ADK_NATIVE},y)
-package-$(ADK_PACKAGE_LIBC) += libc
-endif
-ifneq (${ADK_NATIVE},y)
-package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread
-endif
 
-ifneq (${ADK_TARGET_LIB_GLIBC},y)
-ifneq (${ADK_TARGET_LIB_MUSL},y)
-ifneq (${ADK_NATIVE},y)
+ifeq (${ADK_TARGET_LIB_UCLIBC},y)
 package-$(ADK_PACKAGE_UCLIBC) += uclibc
-gcc-compile: uclibc-compile
-endif
 package-$(ADK_PACKAGE_UCLIBCXX) += uclibc++
+gcc-compile: uclibc-compile
 endif
-endif
+
+package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread
 
 include $(TOPDIR)/package/Depends.mk
 
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index e207dac9b..c6e1811a5 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -52,11 +52,7 @@ CONFIGURE_ARGS+=	--disable-static \
 			--with-dri-drivers=${DRI_DRIVERS},swrast
 CONFIGURE_ENV+=		MISSING="echo" \
 			PYTHON2=$(PYTHON)
-
 XAKE_FLAGS+=		HOST_CC=${CC_FOR_BUILD}
-ifeq ($(ADK_NATIVE),y)
-XAKE_FLAGS+=		RANLIB=ranlib AR=ar
-endif
 
 mesalib-install:
 	$(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri
diff --git a/package/ant/Makefile b/package/ant/Makefile
index 5476596eb..625853bd8 100644
--- a/package/ant/Makefile
+++ b/package/ant/Makefile
@@ -14,8 +14,6 @@ PKG_SITES:=		http://archive.apache.org/dist/ant/source/
 DISTFILES:=             apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2
 WRKDIST=                $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_ARCH_DEPENDS:=	native
-
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index b6e6fb616..c23bac585 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -33,13 +33,9 @@ endif
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_CFLAGS+=		-fPIC
-ifeq ($(ADK_NATIVE),)
 CONFIGURE_ARGS+=	--disable-werror \
 			--host=$(GNU_TARGET_NAME) \
 			--target=$(GNU_TARGET_NAME)
-else
-CONFIGURE_ARGS+=	--disable-werror
-endif
 # disable honour cflags stuff
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index d4184a37a..1fe63ff0a 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -36,12 +36,8 @@ INSTALL_STYLE:=		manual
 
 BB_MAKE_FLAGS:=		V=1 IPKG_ARCH="${CPU_ARCH}" ARCH="${ARCH}" GCC_HONOUR_COPTS=s \
 			HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
+			CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc' \
 			-C ${WRKBUILD} 
-ifneq (${ADK_NATIVE},y)
-BB_MAKE_FLAGS+=		CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc'
-else
-BB_MAKE_FLAGS+=		EXTRA_LDFLAGS="-static-libgcc"
-endif
 
 do-configure:
 	# get all symbols from top level config
diff --git a/package/cdrtools/Makefile b/package/cdrtools/Makefile
index 9483ad7b9..1b195fc3f 100644
--- a/package/cdrtools/Makefile
+++ b/package/cdrtools/Makefile
@@ -12,8 +12,6 @@ PKG_SECTION:=		misc
 PKG_URL:=		http://cdrecord.berlios.de/private/cdrecord.html
 PKG_SITES:=		http://openadk.org/
 
-PKG_ARCH_DEPENDS:=	native
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,CDRTOOLS,cdrtools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/cmake/Makefile b/package/cmake/Makefile
index e4d26b185..1079227f2 100644
--- a/package/cmake/Makefile
+++ b/package/cmake/Makefile
@@ -12,8 +12,6 @@ PKG_SECTION:=		lang
 PKG_URL:=		http://www.cmake.org/
 PKG_SITES:=		http://www.cmake.org/files/v2.8/
 
-PKG_ARCH_DEPENDS:=	native
-
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/ecj/Makefile b/package/ecj/Makefile
index 37a463eb1..92898307b 100644
--- a/package/ecj/Makefile
+++ b/package/ecj/Makefile
@@ -12,8 +12,6 @@ PKG_SECTION:=		lang
 
 NO_DISTFILES:=		1
 
-PKG_ARCH_DEPENDS:=	native
-
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/fastjar/Makefile b/package/fastjar/Makefile
index e14c66076..0f4c1a50c 100644
--- a/package/fastjar/Makefile
+++ b/package/fastjar/Makefile
@@ -11,8 +11,6 @@ PKG_DESCR:=		fastjar utility
 PKG_SECTION:=		lang
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fastjar/}
 
-PKG_ARCH_DEPENDS:=	native
-
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index e4b69591d..1fb663e06 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -22,7 +22,7 @@ PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_
 PKG_NOPARALLEL:=	1
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	arm x86 x86_64 native mips
+PKG_ARCH_DEPENDS:=	arm x86 x86_64 mips
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin
 PKG_SYSTEM_DEPENDS:=	tarox-pc ibm-x40 lemote-yeelong qemu-i686 qemu-x86_64 qemu-mips64el raspberry-pi
 
diff --git a/package/gcj/Makefile b/package/gcj/Makefile
index be7059def..5ff8cc810 100644
--- a/package/gcj/Makefile
+++ b/package/gcj/Makefile
@@ -13,7 +13,6 @@ PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
 
 DISTFILES:=		gcc-$(PKG_VERSION).tar.bz2
 
-PKG_ARCH_DEPENDS:=	native
 WRKDIST=		${WRKDIR}/gcc-${PKG_VERSION}
 
 include $(TOPDIR)/mk/host.mk
diff --git a/package/jikes/Makefile b/package/jikes/Makefile
index 6f7649a49..7404fc123 100644
--- a/package/jikes/Makefile
+++ b/package/jikes/Makefile
@@ -13,8 +13,6 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
 
 DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
-PKG_ARCH_DEPENDS:=	native
-
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 2af556c9e..692b7d630 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -31,10 +31,6 @@ PKGSS_KRB5_UTIL:=	libkrb5 libncurses libss libcom-err
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-signed.tar
 WRKSRC=			${WRKDIST}/src
 
-ifeq ($(ADK_NATIVE),y)
-NM:=nm
-endif
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/libc/Config.in.manual b/package/libc/Config.in.manual
deleted file mode 100644
index ae74da26d..000000000
--- a/package/libc/Config.in.manual
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBC
-	boolean
-	depends on ADK_NATIVE
-	default y if ADK_NATIVE
-	help 
-	 Native C library from host system.
diff --git a/package/libc/Makefile b/package/libc/Makefile
deleted file mode 100644
index 9b85b82bc..000000000
--- a/package/libc/Makefile
+++ /dev/null
@@ -1,36 +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:=		libc
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		2
-PKG_SECTION:=		base
-PKG_DESCR:=		native C library
-
-NO_DISTFILES:=		1
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LIBC,libc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-# do nothing, use native c library
-do-install:
-	${INSTALL_DIR} $(IDIR_LIBC)/lib
-	$(CP) /lib/libgcc_s.so* $(IDIR_LIBC)/lib/
-	$(CP) /lib/ld*-*.so* $(IDIR_LIBC)/lib/
-	if test -f /lib/libuClibc-*.so; then $(CP) /lib/libuClibc-*.so \
-		$(IDIR_LIBC)/lib/;fi
-	-for file in libc libpthread libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
-		$(CP) /lib/$$file.so.* $(IDIR_LIBC)/lib/; \
-		$(CP) /lib/$$file-*.so $(IDIR_LIBC)/lib/; \
-	done
-	# create ld.so link for ldd
-	cd $(IDIR_LIBC)/lib && ln -sf ld-linux.so.2 ld.so
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 28f277f8d..20f7f60f9 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -19,7 +19,6 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-install:
-ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
 ifeq ($(ADK_LINUX_SH),y)
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
@@ -30,6 +29,5 @@ endif
 else
 	${CP} ${STAGING_TARGET_DIR}/$(ADK_TARGET_LIBC_PATH)/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
 endif
-endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index f6f9e5f5f..cdb84d5fe 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -12,10 +12,6 @@ endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif
-ifeq ($(ADK_NATIVE),y)
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		1
-endif
 
 PKG_NAME:=		libpthread
 PKG_DESCR:=		POSIX threading library
@@ -37,11 +33,9 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 libpthread-install:
-ifeq ($(ADK_NATIVE),)
 ifeq ($(ADK_TARGET_LIB_MUSL),)
 	${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
 	${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
 endif
-endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/librt/Makefile b/package/librt/Makefile
index d056bc203..cf646672f 100644
--- a/package/librt/Makefile
+++ b/package/librt/Makefile
@@ -9,10 +9,6 @@ endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif
-ifeq ($(ADK_NATIVE),y)
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		1
-endif
 
 PKG_NAME:=		librt
 PKG_DESCR:=		Realtime library
@@ -34,11 +30,9 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 librt-install:
-ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBRT}/$(ADK_TARGET_LIBC_PATH)
 ifeq ($(ADK_TARGET_LIB_MUSL),)
 	${CP} ${STAGING_TARGET_DIR}/lib/librt*.so* ${IDIR_LIBRT}/$(ADK_TARGET_LIBC_PATH)
 endif
-endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libssh/Makefile b/package/libssh/Makefile
index 997e78895..6a49c346a 100644
--- a/package/libssh/Makefile
+++ b/package/libssh/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		9ad01838d3b89d98e900e0f6260a88cc
 PKG_DESCR:=		SSH library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libopenssl zlib
-PKG_BUILDDEP:=		openssl zlib
+PKG_BUILDDEP:=		cmake-host openssl zlib
 PKG_URL:=		http://www.libssh.org/
 PKG_SITES:=		http://www.libssh.org/files/0.5/
 PKG_OPTS:=		dev
diff --git a/package/libssp/Makefile b/package/libssp/Makefile
index a5a4a2dc7..def4443e8 100644
--- a/package/libssp/Makefile
+++ b/package/libssp/Makefile
@@ -9,10 +9,6 @@ endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 include ${TOPDIR}/toolchain/uClibc/Makefile.inc
 endif
-ifeq ($(ADK_NATIVE),y)
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		1
-endif
 
 PKG_NAME:=		libssp
 PKG_DESCR:=		Stack smashing protection library
@@ -34,9 +30,7 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 libssp-install:
-ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBSSP}/$(ADK_TARGET_LIBC_PATH)
 	${CP} ${STAGING_TARGET_DIR}/lib/libssp.so* ${IDIR_LIBSSP}/$(ADK_TARGET_LIBC_PATH)
-endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index 7fc3503f8..84f0a7aec 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -28,11 +28,7 @@ INSTALL_STYLE:=		manual
 
 do-install:
 	${INSTALL_DIR} ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
-ifeq ($(ADK_NATIVE),y)
-	$(CP) /usr/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib
-else
 	$(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
 	-@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py
-endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile
index ed92676a3..a2e14cd10 100644
--- a/package/libthread_db/Makefile
+++ b/package/libthread_db/Makefile
@@ -32,11 +32,9 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-install:
-ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBTHREAD_DB}/lib
 ifeq ($(ADK_TARGET_LIB_MUSL),)
 	${CP} ${STAGING_TARGET_DIR}/lib/libthread_db*.so* ${IDIR_LIBTHREAD_DB}/lib
 endif
-endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 694c9d7ae..59a71d6ed 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -40,1