simplify buildsystem

- remove ADK_IPV6, ADK_CXX and ADK_X11
- enable ipv6 by default in uclibc
- enable build of c++ compiler by default

Config.in

@@ -20,7 +20,6 @@ menu "ADK settings"
 config ADK_DEVELSYSTEM
 	bool "Compile a ADK development system"
 	default n
-	select ADK_CXX
 	select ADK_PACKAGE_AUTOCONF
 	select ADK_PACKAGE_AUTOMAKE
 	select ADK_PACKAGE_BASH

mk/build.mk

@@ -23,7 +23,7 @@ noconfig_targets:=	menuconfig \
 MAKECLEAN_SYMBOLS=	ADK_TARGET_LIB_UCLIBC \
 			ADK_TARGET_LIB_GLIBC \
 			ADK_TARGET_LIB_ECLIBC \
-			ADK_IPV6 ADK_CXX ADK_DEBUG
+			ADK_DEBUG
 
 POSTCONFIG=		-@\
 	if [ -f .config.old ];then \

mk/package.mk

@@ -33,11 +33,6 @@ CONFIGURE_ARGS+=	--enable-debug
 else
 CONFIGURE_ARGS+=	--disable-debug
 endif
-ifeq ($(ADK_IPV6),y)
-CONFIGURE_ARGS+=	--enable-ipv6
-else
-CONFIGURE_ARGS+=	--disable-ipv6
-endif
 
 ifeq ($(ADK_NATIVE),y)
 CONFIGURE_ENV+=		CONFIG_SHELL='$(strip ${SHELL})' \

package/6tunnel/Config.in

@@ -1,6 +1,5 @@
 config ADK_PACKAGE_6TUNNEL
 	prompt "6tunnel........................... IPv4 / IPv6 tunnel proxy"
-	depends on ADK_IPV6
 	tristate
 	default n
 	select ADK_KPACKAGE_KMOD_IPV6

package/Config.in

@@ -214,7 +214,6 @@ source "package/wput/Config.in"
 endmenu
 
 menu "IPv6"
-depends on ADK_IPV6
 source "package/6tunnel/Config.in"
 source "package/aiccu/Config.in"
 source "package/miredo/Config.in"
@@ -485,7 +484,6 @@ source "package/zlib/Config.in"
 endmenu
 
 menu "X"
-depends on ADK_X11
 source "package/xorg-server/Config.in"
 source "package/xf86-video-geode/Config.in"
 
@@ -511,6 +509,7 @@ source "package/pixman/Config.in"
 source "package/xkbcomp/Config.in"
 source "package/xkeyboard-config/Config.in"
 endmenu
+
 endmenu
 
 endmenu

package/Depends.mk

@@ -103,9 +103,7 @@ libp11-compile: openssl-compile libtool-compile
 libpng-compile: zlib-compile
 libshout-compile: libvorbis-compile
 libusb-compat-compile: libusb-compile
-ifeq (${ADK_IPV6},y)
 libtirpc-compile: libgssglue-compile
-endif
 libtorrent-compile: openssl-compile libsigc++-compile
 libvorbis-compile: libogg-compile
 libvirt-compile: libxml2-compile gnutls-compile python-compile
@@ -155,9 +153,7 @@ endif
 ifeq (${ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL},y)
 nfs-utils-compile: libnfsidmap-compile heimdal-compile libevent-compile librpcsecgss-compile
 endif
-ifeq (${ADK_IPV6},y)
 nfs-utils-compile: libtirpc-compile
-endif
 ifeq (${ADK_COMPILE_NMAP_WITH_UCLIBCXX},y)
 nmap-compile: uclibc++-compile
 endif

package/aiccu/Config.in

@@ -1,6 +1,5 @@
 config ADK_PACKAGE_AICCU
 	prompt "aiccu............................. SixXS Automatic IPv6 Connectivity Client Utility"
-	depends on ADK_IPV6
 	tristate
 	default n
 	select ADK_KPACKAGE_KMOD_IPV6

package/bitlbee/Makefile

@@ -19,11 +19,6 @@ PKG_SITES:=		http://get.bitlbee.org/src/ \
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BITLBEE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-ifeq ($(ADK_IPV6),y)
-IPV6+=	--ipv6=1
-else
-IPV6+=	--ipv6=0
-endif
 
 do-configure:
 		(cd $(WRKBUILD); \
@@ -34,6 +29,7 @@ do-configure:
 			STAGING_DIR="$(STAGING_DIR)" \
 			STRIP="$(STRIP)" \
 			./configure \
+			--target=${REAL_GNU_TARGET_NAME} \
 			--prefix=/usr/ \
 			--bindir=/usr/sbin/ \
 			--etcdir=/etc/bitlbee/ \
@@ -43,13 +39,12 @@ do-configure:
 			--cpu="${ARCH}" \
 			--debug=0 \
 			--strip=1 \
+			--ipv6=1 \
 			--ssl=openssl \
-			--target=${REAL_GNU_TARGET_NAME} \
-			${IPV6} \
 		);
 
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 INSTALL_TARGET=		install-etc install-bin
 
 post-configure:

package/bogofilter/Config.in

@@ -2,7 +2,6 @@ config ADK_PACKAGE_BOGOFILTER
 	prompt "bogofilter........................ Mail (spam) filter utility"
 	tristate
 	default n
-	depends on ADK_CXX
 	select ADK_PACKAGE_LIBDB
 	select ADK_PACKAGE_LIBICONV
 	help

package/cbtt/Config.in

@@ -3,7 +3,6 @@ config ADK_PACKAGE_CBTT
 	tristate
 	default n
 	select ADK_PACKAGE_ZLIB
-	depends on ADK_CXX
 	help
 	 A C BitTorrent Tracker
 
@@ -13,6 +12,5 @@ config ADK_PACKAGE_CBTT_MYSQL
 	default n
 	select ADK_PACKAGE_ZLIB
 	select ADK_PACKAGE_LIBMYSQLCLIENT
-	depends on ADK_CXX
 	help
 	 A C BitTorrent Tracker

package/ctorrent/Config.in

@@ -2,7 +2,6 @@ config ADK_PACKAGE_CTORRENT
 	prompt "ctorrent.......................... console-based BitTorrent client"
 	tristate
 	default n
-	depends on ADK_CXX
 	help
 	  CTorrent is a BitTorrent client written in the C programming language, known to
 	  be a very robust and mature programming language, which produces fast and

package/cxxtools/Config.in

@@ -2,7 +2,6 @@ config ADK_PACKAGE_CXXTOOLS
 	prompt "cxxtools.......................... cxxtools"
 	tristate
 	default n
-	depends on ADK_CXX
 	select ADK_PACKAGE_LIBICONV
 	help
 	  http://www.tntnet.org

package/dansguardian/Config.in

@@ -1,7 +1,6 @@
 config ADK_PACKAGE_DANSGUARDIAN
 	prompt "dansguardian...................... web content filter proxy"
 	tristate
-	depends on ADK_CXX
 	select ADK_PACKAGE_LIBPCRE
 	select ADK_PACKAGE_ZLIB
 	default n
@@ -11,7 +10,7 @@ config ADK_PACKAGE_DANSGUARDIAN
 choice
 prompt "C++ library to use"
 depends on ADK_PACKAGE_DANSGUARDIAN
-default ADK_COMPILE_DANSGUARDIAN_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_DANSGUARDIAN_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 default ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
 
 config ADK_COMPILE_DANSGUARDIAN_WITH_STDCXX

package/dhcp/Makefile

@@ -12,24 +12,18 @@ PKG_SECTION:=		net
 PKG_URL:=		https://www.isc.org/software/dhcp
 PKG_SITES:=		ftp://ftp.isc.org/isc/dhcp/
 
-PKG_DESCR_1:=		ISC DHCP relay server
+PKG_DESCR_RELAY:=	ISC DHCP relay server
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
-
-ifeq ($(ADK_IPV6),y)
-CONFIGURE_ARGS+=       --enable-dhcpv6         
-else
-CONFIGURE_ARGS+=       --disable-dhcpv6                
-endif
+$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_RELAY},${PKG_SECTION}))
 
 TCFLAGS+=		-D_GNU_SOURCE
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_file__dev_random=yes
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_DHCP_RELAY}/usr/sbin

package/dnsmasq/Makefile

@@ -17,10 +17,8 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE:=		auto
+INSTALL_STYLE:=		manual
 MAKE_FLAGS+=		BINDIR=/usr/sbin MANDIR=/usr/man COPTS="${TCFLAGS}"
-ifneq ($(ADK_IPV6),y)
-MAKE_FLAGS+=		COPTS="${TCFLAGS} -DNO_IPV6"
-endif
 
 do-install:
 	${INSTALL_DIR} ${IDIR_DNSMASQ}/usr/sbin ${IDIR_DNSMASQ}/etc

package/freeradius-server/Config.in

@@ -80,7 +80,6 @@ config ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL
 	prompt     "freeradius-mod-sql-mysql.... MySQL module"
 	tristate
 	default n
-	depends on ADK_CXX
 	depends on ADK_PACKAGE_FREERADIUS_MOD_SQL
 	select ADK_PACKAGE_LIBMYSQLCLIENT
 

package/gmediaserver/Config.in

@@ -2,12 +2,8 @@ config ADK_PACKAGE_GMEDIASERVER
 	prompt "gmediaserver...................... An UPnP music media server"
 	tristate
 	default n
-	depends on ADK_CXX
 	select ADK_PACKAGE_ID3LIB
 	select ADK_PACKAGE_LIBUPNP
 	help
 	  An UPnP music media server.
-
 	  http://www.nongnu.org/gmediaserver/
-
-	  Depends: id3lib, libupnp

package/gpsd/Config.in

@@ -2,7 +2,6 @@ config ADK_PACKAGE_GPSD
 	prompt "gpsd.............................. An interface daemon for GPS receivers"
 	tristate
 	default n
-	depends on ADK_CXX
 	select ADK_PACKAGE_LIBPTHREAD
 	help
 	  gpsd is a monitor daemon that watches a TCP/IP port (2947 by default),
@@ -28,7 +27,7 @@ config ADK_PACKAGE_GPSD_CLIENTS
 choice
 prompt "C++ library to use"
 depends on ADK_PACKAGE_GPSD
-default ADK_COMPILE_GPSD_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_GPSD_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 default ADK_COMPILE_GPSD_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
 
 config ADK_COMPILE_GPSD_WITH_STDCXX

package/heimdal/Makefile

@@ -38,14 +38,9 @@ CONFIGURE_OPTS:=	--with-hdbdir=/etc/heimdal \
 			--disable-ndbm-db \
 			--libdir=/usr/lib/heimdal \
 			--libexecdir=/usr/sbin \
+			--with-ipv6 \
 			--sysconfdir=/etc/heimdal
 
-ifeq ($(ADK_IPV6),y)
-CONFIGURE_OPTS+=	--with-ipv6
-else
-CONFIGURE_OPTS+=	--without-ipv6
-endif
-
 ifeq ($(ADK_COMPILE_HEIMDAL_WITH_DB_BDB),y)
 CONFIGURE_ARGS+=	--enable-berkeley-db
 else
@@ -66,8 +61,8 @@ else
 CONFIGURE_OPTS+=	--disable-pk-init
 endif
 
-TCFLAGS+=		-I${STAGING_DIR}/usr/include/et
-TCFLAGS+=              -pthread
+TCFLAGS+=		-I${STAGING_DIR}/usr/include/et -pthread
+
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_OPTS}
 CONFIGURE_ENV+=		ac_cv_func_getaddrinfo_numserv=yes

package/id3lib/Config.in

@@ -2,12 +2,10 @@ config ADK_PACKAGE_ID3LIB
 	prompt "id3lib............................ An ID3v1/ID3v2 tagging library"
 	tristate
 	default n
-	depends on ADK_CXX
 	select ADK_PACKAGE_ZLIB
 	select ADK_PACKAGE_LIBICONV
 	help
 	  An ID3v1/ID3v2 tagging library.
-
 	  http://www.id3lib.org/
 
 choice

package/iperf/Config.in

@@ -1,20 +1,18 @@
 config ADK_PACKAGE_IPERF
 	prompt "iperf............................. Internet Protocol bandwidth measuring tool"
 	tristate
-	depends on ADK_CXX
 	select ADK_PACKAGE_LIBPTHREAD
 	default n
 	help
 	  Iperf is a modern alternative for measuring TCP and UDP bandwidth 
 	  performance, allowing the tuning of various parameters and 
 	  characteristics.
-	  
 	  http://dast.nlanr.net/Projects/Iperf/
 
 choice
 prompt "C++ library to use"
 depends on ADK_PACKAGE_IPERF
-default ADK_COMPILE_IPERF_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_IPERF_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 default ADK_COMPILE_IPERF_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
 
 config ADK_COMPILE_IPERF_WITH_STDCXX

package/iptables/Makefile

@@ -25,9 +25,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-ifeq ($(ADK_IPV6),y)
 $(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-endif
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-devel
@@ -35,9 +33,7 @@ BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
 SUB_INSTALL-${ADK_PACKAGE_IPTABLES_UTILS}+=		iptables-utils-install
-ifeq ($(ADK_IPV6),y)
 SUB_INSTALL-${ADK_PACKAGE_IP6TABLES}+=			ip6tables-install
-endif
 
 post-install: ${SUB_INSTALL-m} ${SUB_INSTALL-y}
 	${INSTALL_DIR} ${IDIR_IPTABLES}/usr/lib

package/kismet/Config.in

@@ -7,7 +7,6 @@ config ADK_PACKAGE_KISMET_CLIENT
 	prompt "kismet-client..................... The Kismet client"
 	tristate
 	default n
-	depends on ADK_CXX
 	select ADK_COMPILE_KISMET
 	select ADK_PACKAGE_LIBNCURSES
 	help
@@ -22,7 +21,6 @@ config ADK_PACKAGE_KISMET_DRONE
 	prompt "kismet-drone...................... The Kismet drone"
 	tristate
 	default n
-	depends on ADK_CXX
 	select ADK_COMPILE_KISMET
 	select ADK_PACKAGE_LIBPCAP
 	help
@@ -37,7 +35,6 @@ config ADK_PACKAGE_KISMET_SERVER
 	prompt "kismet-server..................... The Kismet server"
 	tristate
 	default n
-	depends on ADK_CXX
 	select ADK_COMPILE_KISMET
 	select ADK_PACKAGE_LIBPCAP
 	help
@@ -51,7 +48,7 @@ config ADK_PACKAGE_KISMET_SERVER
 choice
 prompt "C++ library to use"
 depends on ADK_PACKAGE_KISMET_CLIENT || ADK_PACKAGE_KISMET_DRONE || ADK_PACKAGE_KISMET_SERVER
-default ADK_COMPILE_KISMET_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_KISMET_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 default ADK_COMPILE_KISMET_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
 
 config ADK_COMPILE_KISMET_WITH_STDCXX

package/libsigc++/Config.in

@@ -1,7 +1,6 @@
 config ADK_PACKAGE_LIBSIGCXX
 	prompt "libsigc++......................... Callback framework for C++"
 	tristate
-	depends on ADK_CXX
 	default n
 	help
 	  Callback framework for C++
@@ -9,7 +8,7 @@ config ADK_PACKAGE_LIBSIGCXX
 choice
 prompt "C++ library to use"
 depends on ADK_PACKAGE_LIBSIGCXX
-default ADK_COMPILE_LIBSIGCXX_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_LIBSIGCXX_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 default ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
 
 config ADK_COMPILE_LIBSIGCXX_WITH_STDCXX

package/libstdcxx/Config.in

@@ -1,7 +1,6 @@
 config ADK_PACKAGE_LIBSTDCXX
 	prompt "libstdc++......................... C++ support library"
 	tristate
-	depends on ADK_CXX
 	default n
 	help
 	  C++ support library

package/libtirpc/Makefile

@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		b3b513a8825aa227deac63ea38c64f41
 PKG_DESCR:=		a transport independent RPC library
 PKG_SECTION:=		libs
+PKG_DEPENDS:=		libgssglue
 PKG_URL:=		http://sourceforge.net/projects/libtirpc
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libtirpc/}
 
@@ -16,20 +17,16 @@ DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-ifeq (${ADK_IPV6},y)
-PKG_DEPENDS+=	libgssglue
-endif
-
 $(eval $(call PKG_template,LIBTIRPC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	autotool gnu
+
 ifneq (${ADK_COMPILE_NFS_UTILS_WITH_KERBEROS},y)
-ifneq (${ADK_IPV6},y)
 CONFIGURE_ARGS+=	--disable-gss
 else
 CONFIGURE_ARGS+=	--enable-gss
 endif
-endif
+
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 

package/libtorrent/Config.in

@@ -2,7 +2,6 @@ config ADK_PACKAGE_LIBTORRENT
 	prompt "libtorrent........................ bittorrent library"
 	tristate
 	default n
-	depends on ADK_CXX
 	select ADK_PACKAGE_LIBOPENSSL
 	select ADK_PACKAGE_LIBSIGCXX
 	help

package/miredo/Config.in

@@ -1,16 +1,12 @@
 config ADK_COMPILE_MIREDO
 	tristate
 	default n
-	depends on ADK_CXX
-	depends on ADK_IPV6
 	depends on ADK_PACKAGE_MIREDO || ADK_PACKAGE_MIREDO_SERVER
 
 config ADK_PACKAGE_MIREDO
 	prompt "miredo............................ Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon"
 	tristate
 	default n
-	depends on ADK_IPV6
-	depends on ADK_CXX
 	select ADK_COMPILE_MIREDO
 	select ADK_KPACKAGE_KMOD_IPV6
 	select ADK_KPACKAGE_KMOD_TUN
@@ -23,8 +19,6 @@ config ADK_PACKAGE_MIREDO_SERVER
 	prompt "miredo-server..................... Teredo (IPv6 tunneling over UDP through NAT) server daemon"
 	tristate
 	default n
-	depends on ADK_IPV6
-	depends on ADK_CXX
 	select ADK_COMPILE_MIREDO
 	select ADK_KPACKAGE_KMOD_IPV6
 	select ADK_KPACKAGE_KMOD_TUN

package/mrd6/Config.in

@@ -1,6 +1,5 @@
 config ADK_PACKAGE_MRD6
 	prompt "mrd6.............................. IPv6 multicast routing daemon"
-	depends on ADK_IPV6
 	tristate
 	default n
 	help

package/mysql/Config.in

@@ -2,7 +2,6 @@ config ADK_COMPILE_MYSQL
 	tristate
 	default n
 	depends on ADK_PACKAGE_LIBMYSQLCLIENT
-	depends on ADK_CXX
 	select ADK_PACKAGE_LIBNCURSES
 	select ADK_PACKAGE_ZLIB
 	select ADK_PACKAGE_LIBREADLINE
@@ -11,10 +10,8 @@ config ADK_PACKAGE_LIBMYSQLCLIENT
 	prompt "libmysqlclient.................... MySQL client library"
 	tristate
 	default n
-	depends on ADK_CXX
 	select ADK_COMPILE_MYSQL
 	help
 	  MySQL client library.
-	  
 	  http://dev.mysql.com/
 

package/ndisc/Config.in

@@ -3,14 +3,12 @@
 config ADK_COMPILE_NDISC6
 	tristate
 	default n
-	depends on ADK_IPV6
 	depends on ADK_PACKAGE_NDISC6 || ADK_PACKAGE_RDISC6 || ADK_PACKAGE_TCPTRACEROUTE6
 
 config ADK_PACKAGE_NDISC6
 	prompt "ndisc6............................ An ICMPv6 neighbour discovery tool"
 	tristate
 	default n
-	depends on ADK_IPV6
 	select ADK_COMPILE_NDISC6
 	help
 	  
@@ -22,7 +20,6 @@ config ADK_PACKAGE_RDISC6
 	prompt "rdisc6............................ An ICMPv6 router discovery tool"
 	tristate
 	default n
-	depends on ADK_IPV6
 	select ADK_COMPILE_NDISC6
 	help
 	  
@@ -34,7 +31,6 @@ config ADK_PACKAGE_TCPTRACEROUTE6
 	prompt "tcptraceroute6.................... A TCP/IPv6-based traceroute implementation"
 	tristate
 	default n
-	depends on ADK_IPV6
 	select ADK_COMPILE_NDISC6
 	help
 	  

package/nfs-utils/Config.in

@@ -5,7 +5,7 @@ config ADK_PACKAGE_NFS_UTILS
 	select ADK_PACKAGE_PORTMAP
 	select ADK_KPACKAGE_KMOD_NFSD
 	select ADK_KPACKAGE_KMOD_NFS_FS
-	select ADK_PACKAGE_LIBTIRPC if ADK_IPV6
+	select ADK_PACKAGE_LIBTIRPC
 	depends on !ADK_TARGET_ROOTFS_NFSROOT
 	help
 	  NFS server utilities (namely, exportfs), and an NFS server.

package/nfs-utils/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		779cf81044e92cb51ad590960e7b3671
 PKG_DESCR:= 		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net
-PKG_DEPENDS:=		portmap
+PKG_DEPENDS:=		portmap libtirpc
 PKG_URL:=		http://sourceforge.net/projects/nfs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}
 
@@ -25,13 +25,9 @@ ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL),y)
 PKG_DEPENDS+=		heimdal-libs libevent libnfsidmap librpcsecgss libcom_err
 endif
 
-ifeq (${ADK_IPV6},y)
-PKG_DEPENDS+=		libtirpc
-endif
-
 $(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	autotool gnu
+TCPPFLAGS+=		-I${LINUX_DIR}/include
 
 ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KRB5),y)
 CONFIGURE_ARGS+=	--enable-nfsv4 \
@@ -55,15 +51,13 @@ endif
 CONFIGURE_ENV+=		knfsd_cv_bsd_signals=no \
 			ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--without-tcp-wrappers \
+			--enable-tirpc \
+			--with-tirpcinclude=${STAGING_DIR}/usr/include/tirpc \
 			--disable-uuid
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-TCPPFLAGS+=		-I${LINUX_DIR}/include
 
-ifeq (${ADK_IPV6},y)
-CONFIGURE_ARGS+=	--enable-tirpc \
-			--with-tirpcinclude=${STAGING_DIR}/usr/include/tirpc
-endif
+CONFIGURE_STYLE:=	autotool gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin

package/nmap/Config.in

@@ -2,7 +2,6 @@ config ADK_PACKAGE_NMAP
 	prompt "nmap.............................. Network exploration and/or security auditing utility"
 	tristate
 	default n
-	depends on ADK_CXX
 	select ADK_PACKAGE_LIBDNET
 	select ADK_PACKAGE_LIBPCAP
 	select ADK_PACKAGE_LIBPCRE
@@ -14,7 +13,7 @@ config ADK_PACKAGE_NMAP
 choice
 prompt "C++ library to use"
 depends on ADK_PACKAGE_NMAP
-default ADK_COMPILE_NMAP_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_NMAP_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 default ADK_COMPILE_NMAP_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
 
 config ADK_COMPILE_NMAP_WITH_STDCXX

package/openobex/Config.in

@@ -2,8 +2,6 @@ config ADK_PACKAGE_OPENOBEX
 	prompt "openobex.......................... openobex library"
 	tristate
 	default n
-	# openobex does not work without ipv6
-	select ADK_IPV6	
 	select ADK_PACKAGE_BLUEZ
 	help
 	  Open source implementation of the Object Exchange (OBEX) protocol.  

package/oprofile/Config.in

@@ -2,7 +2,6 @@ config ADK_PACKAGE_OPROFILE
 	prompt "oprofile.......................... a system-wide profiler"
 	tristate
 	select ADK_PACKAGE_LIBPOPT
-	depends on ADK_CXX
 	default n
 	help
 	  http://oprofile.sourceforge.net

package/php/Config.in

@@ -62,7 +62,6 @@ config ADK_PACKAGE_PHP_MOD_MYSQL
 	prompt "php-mod-mysql.................... MySQL module"
 	tristate 
 	default n
-	depends on ADK_CXX
 	depends on ADK_COMPILE_PHP
 	select ADK_PACKAGE_LIBMYSQLCLIENT
 

package/ppp/Makefile

@@ -24,16 +24,13 @@ $(eval $(call PKG_template,PPP_MOD_PPPDUMP,ppp-mod-pppdump,${PKG_VERSION}-${PKG_
 $(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq ($(ADK_IPV6),y)
-IPV6+=HAVE_INET6="1"
-endif
-
 CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
+
 XAKE_FLAGS+=		CC="${TARGET_CC}" \
 			COPTS="${TCFLAGS}" \
-			${IPV6} \
+			HAVE_INET6="1" \
 			STAGING_DIR=${STAGING_DIR} \
 			DESTDIR="${WRKINST}/usr" \
 			TARGET_AR='${TARGET_CROSS}ar'

package/quagga/Config.in

@@ -3,7 +3,6 @@
 config ADK_PACKAGE_QUAGGA
 	prompt "quagga............................ The Quagga Software Routing Suite"
 	tristate
-	depends on ADK_IPV6
 	default n
 	help
 	  A routing software package that provides TCP/IP based routing services
@@ -34,7 +33,6 @@ config ADK_PACKAGE_QUAGGA_OSPF6D
 	tristate
 	default n
 	depends on ADK_PACKAGE_QUAGGA
-	depends on ADK_IPV6
 	help
 	  An OSPFv3 (IPv6) routing engine for use with Quagga routing software.
 
@@ -51,7 +49,6 @@ config ADK_PACKAGE_QUAGGA_RIPNGD
 	tristate
 	default n
 	depends on ADK_PACKAGE_QUAGGA
-	depends on ADK_IPV6
 	help
 	  A RIPNG (IPv6) routing engine for use with Quagga routing software.
 

package/quagga/Makefile

@@ -27,10 +27,8 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,QUAGGA,quagga,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,QUAGGA_BGPD,quagga-bgpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
 $(eval $(call PKG_template,QUAGGA_OSPFD,quagga-ospfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION}))
-ifeq ($(ADK_IPV6),y)
 $(eval $(call PKG_template,QUAGGA_OSPF6D,quagga-ospf6d,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION}))
 $(eval $(call PKG_template,QUAGGA_RIPNGD,quagga-ripngd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_4},${PKG_SECTION}))
-endif
 $(eval $(call PKG_template,QUAGGA_RIPD,quagga-ripd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_5},${PKG_SECTION}))
 $(eval $(call PKG_template,QUAGGA_VTYSH,quagga-vtysh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_6},${PKG_SECTION}))
 
@@ -58,12 +56,10 @@ post-install:
 	${INSTALL_DIR} ${IDIR_QUAGGA_OSPFD}/usr/{lib,sbin}
 	${CP} ${WRKINST}/usr/lib/libospf.so.* ${IDIR_QUAGGA_OSPFD}/usr/lib/
 	${CP} ${WRKINST}/usr/sbin/ospfd ${IDIR_QUAGGA_OSPFD}/usr/sbin/
-ifeq ($(ADK_IPV6),y)
 	${INSTALL_DIR} ${IDIR_QUAGGA_OSPF6D}/usr/sbin
 	${CP} ${WRKINST}/usr/sbin/ospf6d ${IDIR_QUAGGA_OSPF6D}/usr/sbin/
 	${INSTALL_DIR} ${IDIR_QUAGGA_RIPNGD}/usr/sbin
 	${CP} ${WRKINST}/usr/sbin/ripngd ${IDIR_QUAGGA_RIPNGD}/usr/sbin/
-endif
 	${INSTALL_DIR} ${IDIR_QUAGGA_RIPD}/usr/sbin
 	${CP} ${WRKINST}/usr/sbin/ripd ${IDIR_QUAGGA_RIPD}/usr/sbin/
 	${INSTALL_DIR} ${IDIR_QUAGGA_VTYSH}/usr/bin

package/radvd/Config.in

@@ -1,11 +1,9 @@
 config ADK_PACKAGE_RADVD
 	prompt "radvd............................. IPv6 Routing Advertisement Daemon"
-	depends on ADK_IPV6
 	tristate
 	default n
 	select ADK_KPACKAGE_KMOD_IPV6
 	help
 	  Routing Advertisement Daemon for IPv6
-	  
 	  http://v6web.litech.org/radvd/
 

package/rpm/Config.in

@@ -1,7 +1,6 @@
 config ADK_PACKAGE_RPM
 	prompt "rpm.................................. Red Hat package manager"
 	tristate
-	depends on ADK_CXX
 	select ADK_PACKAGE_NSS
 	select ADK_PACKAGE_NSPR
 	select ADK_PACKAGE_ZLIB

package/rrs/Config.in

@@ -7,7 +7,6 @@ config ADK_PACKAGE_RRS
 	prompt "rrs............................... A reverse (connecting) remote shell, with SSL support"
 	tristate
 	default n
-	depends on ADK_CXX
 	select ADK_COMPILE_RRS
 	select ADK_PACKAGE_ZLIB
 	select ADK_PACKAGE_LIBOPENSSL
@@ -20,7 +19,6 @@ config ADK_PACKAGE_RRS_NOSSL
 	prompt "rrs-nossl......................... A reverse (connecting) remote shell, without SSL support"
 	tristate
 	default n
-	depends on ADK_CXX
 	select ADK_COMPILE_RRS
 	select ADK_PACKAGE_ZLIB
 	help
@@ -31,7 +29,7 @@ config ADK_PACKAGE_RRS_NOSSL
 choice
 prompt "C++ library to use"
 depends on ADK_PACKAGE_RRS
-default ADK_COMPILE_RRS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_RRS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 default ADK_COMPILE_RRS_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
 
 config ADK_COMPILE_RRS_WITH_STDCXX

package/rtorrent/Config.in

@@ -1,7 +1,6 @@
 config ADK_PACKAGE_RTORRENT
 	prompt "rtorrent........................... console bittorrent client"
 	tristate
-	depends on ADK_CXX
 	select ADK_PACKAGE_LIBNCURSES
 	select ADK_PACKAGE_LIBTORRENT
 	select ADK_PACKAGE_LIBCURL

package/samba/Makefile

@@ -21,18 +21,13 @@ $(eval $(call PKG_template,SAMBA,samba,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 $(eval $(call PKG_template,SAMBA_CLIENT,samba-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SAMBA_PASSWD,samba-passwd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 TLDFLAGS+=		-Wl,-rpath -Wl,/usr/lib/samba
+
 CONFIGURE_ENV+=		samba_cv_CC_NEGATIVE_ENUM_VALUES=no \
 			samba_cv_USE_SETRESUID=no \
 			ac_cv_lib_ext_nsl_connect=no \
 			ac_cv_search_yp_get_default_domain=no \
 			ac_cv_lib_ext_nsl_gethostbyname=no
-ifeq ($(ADK_IPV6),y)
-CONFIGURE_ENV+=		libreplace_cv_HAVE_IPV6=yes
-else
-CONFIGURE_ENV+=		libreplace_cv_HAVE_IPV6=no
-endif
 CONFIGURE_ARGS+=	--libdir=/usr/lib/samba \
 			--localstatedir=/var/log/samba \
 			--with-configdir=/etc/samba \
@@ -48,6 +43,8 @@ CONFIGURE_ARGS+=	--libdir=/usr/lib/samba \
 			--with-ldap=no \
 			--without-cluster-support \
 			--without-sendfile-support
+
+CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 

package/speex/Config.in

@@ -1,7 +1,6 @@
 config ADK_COMPILE_SPEEX
 	tristate
 	default n
-	depends on ADK_CXX
 	depends on ADK_PACKAGE_LIBSPEEX
 
 config ADK_PACKAGE_LIBSPEEX
@@ -17,8 +16,6 @@ config ADK_PACKAGE_LIBSPEEX
 	  alternative to expensive proprietary speech codecs. Moreover, Speex 
 	  is well-adapted to Internet applications and provides useful features 
 	  that are not present in most other codecs.
-	  
 	  http://www.speex.org/
 	  
-	  This package contains the shared codec library, needed by other programs.
 

package/squid/Config.in

@@ -3,7 +3,6 @@ config ADK_PACKAGE_SQUID
 	prompt "squid............................. full-featured Web proxy cache"
 	tristate
 	default n
-	depends on ADK_CXX
 	select ADK_PACKAGE_LIBOPENSSL
 	help
 	  Squid is a high-performance proxy caching server for web clients, 
@@ -16,7 +15,7 @@ config ADK_PACKAGE_SQUID
 choice
 prompt "C++ library to use"
 depends on ADK_PACKAGE_SQUID
-default ADK_COMPILE_SQUID_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_SQUID_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 default ADK_COMPILE_SQUID_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
 
 config ADK_COMPILE_SQUID_WITH_STDCXX

package/tntnet/Config.in

@@ -2,7 +2,6 @@ config ADK_PACKAGE_TNTNET
 	prompt "tntnet............................ a modular, multithreaded webapplicationserver"
 	tristate
 	default n
-	depends on ADK_CXX
 	select ADK_PACKAGE_CXXTOOLS
 	select ADK_PACKAGE_LIBICONV
 	select ADK_PACKAGE_LIBPTHREAD

package/uclibc++/Config.in

@@ -1,7 +1,6 @@
 config ADK_PACKAGE_UCLIBCXX
 	prompt "uClibc++.......................... C++ library for embedded systems"
 	tristate
-	depends on ADK_CXX
 	default n
 	help
 	  A standard C++ library for embedded systems

package/ulogd/Config.in

@@ -14,7 +14,6 @@ config ADK_PACKAGE_ULOGD_MOD_MYSQL
 	prompt   "ulogd-mod-mysql............... Output plugin for logging into a MySQL database"
 	tristate
 	default n
-	depends on ADK_CXX
 	depends on ADK_PACKAGE_ULOGD
 	select ADK_PACKAGE_LIBMYSQLCLIENT
 

package/ustl/Config.in

@@ -2,12 +2,10 @@ config ADK_PACKAGE_USTL
 	prompt "ustl.............................. C++ Standard Template Library for embedded systems"
 	tristate
 	default n
-	depends on ADK_CXX
 	help
 	  uSTL is a partial implementation of the STL (Standard Template 
 	  Library) that reduces code size by factoring memory management 
 	  code into a non-template base class and deriving containers 
 	  from it.
-	  
 	  http://ustl.sourceforge.net/
 

target/Config.in

@@ -250,12 +250,12 @@ config ADK_LINUX_ARM_G1
 	 Just toolchain support to cross-compile your own
 	 applications. Use static linking for your packages.
 
-#config ADK_LINUX_XSCALE_ZAURUS
-#	bool "Zaurus SL-C3200"
-#	select ADK_zaurus
-#	select ADK_TARGET_NO_FPU
-#	help
-#	 Support for Sharp Zaurus SL-C3200 (aka Terrier)
+config ADK_LINUX_XSCALE_ZAURUS
+	bool "Zaurus SL-C3200"
+	select ADK_zaurus
+	select ADK_TARGET_NO_FPU
+	help
+	 Support for Sharp Zaurus SL-C3200 (aka Terrier)
 
 config ADK_LINUX_RESCUE
 	bool "Minimal Linux Rescuesystem"
@@ -772,38 +772,4 @@ config ADK_TARGET_PACKAGE_RPM
 
 endchoice
 
-# broken and untested right now
-#config ADK_SSP
-#	bool "Enable Stack Smashing Protection"
-#	default n
-#	depends on ADK_LINUX_X86_ALIX1C || \
-#		ADK_LINUX_CRIS_FOXBOARD
-#	help
-#	  Enable Stack Smashing Protection
-
-config ADK_CXX
-	bool "Enable C++ support"
-	default n
-	help
-	  Enable C++ compiler and libraries.
-
-config ADK_IPV6
-	bool "Enable IPv6 support"
-	default n
-	select ADK_KPACKAGE_KMOD_IPV6
-	select BUSYBOX_FEATURE_IPV6
-	select BUSYBOX_FEATURE_IFUPDOWN_IPV6
-	select BUSYBOX_PING6
-	help
-	  Enable basic IPv6 support and
-	  make the IPv6 support options in packages visible.
-
-config ADK_X11
-	bool "Enable X.org/X11 support"
-	default n
-	help
-	  Enable Xorg/X11 server and applications in menu.
-	  Try to compile other packages with X11 support. 
-	  (f.e. mplayer)
-
 endmenu

target/alix1c/uclibc.config

@@ -144,7 +144,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/alix2d/uclibc.config

@@ -144,7 +144,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/foxboard/uclibc.config

@@ -145,7 +145,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/g1/uclibc.config

@@ -146,7 +146,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/lemote/uclibc.config

@@ -135,7 +135,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/linux/config/Config.in.network

@@ -124,7 +124,6 @@ config ADK_KPACKAGE_KMOD_NET_IPGRE
 config ADK_KPACKAGE_KMOD_IPV6
 	prompt "kmod-ipv6......................... IPv6 support"
 	tristate
-	depends on ADK_IPV6
 	default n
 	help
 	  This is complemental support for the IP version 6.
@@ -139,7 +138,6 @@ config ADK_KPACKAGE_KMOD_IPV6
 config ADK_KPACKAGE_KMOD_IPV6_SIT
 	prompt "kmod-ipv6-sit..................... IPv6-in-IPv4 tunnel (SIT driver)"
 	tristate
-	depends on ADK_IPV6
 	select ADK_KPACKAGE_KMOD_INET_TUNNEL
 	default n
 	help

target/native/uclibc.config

@@ -144,7 +144,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/qemu-arm/uclibc.config

@@ -147,7 +147,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/qemu-cris/uclibc.config

@@ -145,7 +145,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/qemu-mips/uclibc.config

@@ -136,7 +136,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/qemu-mips64/uclibc.config

@@ -136,7 +136,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/qemu-mips64el/uclibc.config

@@ -136,7 +136,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/qemu-mipsel/uclibc.config

@@ -153,7 +153,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/qemu-x86/uclibc.config

@@ -144,7 +144,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/qemu-x86_64/uclibc.config

@@ -144,7 +144,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/rb411/uclibc.config

@@ -136,7 +136,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/rb433/uclibc.config

@@ -136,7 +136,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/rb532/uclibc.config

@@ -135,7 +135,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/rescue-x86/uclibc.config

@@ -144,7 +144,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/rescue-x86_64/uclibc.config

@@ -127,7 +127,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/shuttle/uclibc.config

@@ -127,7 +127,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/tomtom/uclibc.config

@@ -146,7 +146,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/wag54g/uclibc.config

@@ -136,7 +136,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/wrap/uclibc.config

@@ -144,7 +144,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

target/zaurus/uclibc.config

@@ -147,7 +147,7 @@ UCLIBC_HAS_CRYPT=y
 UCLIBC_HAS_NETWORK_SUPPORT=y
 UCLIBC_HAS_SOCKET=y
 UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
 UCLIBC_HAS_REENTRANT_RPC=y

toolchain/binutils/Makefile

@@ -6,12 +6,6 @@ include ../rules.mk
 include Makefile.inc
 include ${TOPDIR}/mk/buildhlp.mk
 
-ifeq ($(ADK_SSP),y)
-CONFOPTS+=		--enable-libssp
-else
-CONFOPTS+=		--disable-libssp
-endif
-
 ifeq ($(ADK_LINUX_64),y)
 CONFOPTS+=		--enable-64-bit-bfd
 endif
@@ -31,6 +25,7 @@ $(WRKBUILD)/.configured:
 		--disable-dependency-tracking \
 		--disable-libtool-lock \
 		--disable-werror \
+		--disable-libssp \
 		${CONFOPTS} \
 	);
 	touch $@

toolchain/gcc/Makefile

@@ -5,13 +5,6 @@ include $(TOPDIR)/rules.mk
 include ../rules.mk
 include Makefile.inc
 
-
-ifeq ($(ADK_CXX),y)
-TARGET_LANGUAGES:=	c,c++
-else
-TARGET_LANGUAGES:=	c
-endif
-
 GCC_CONFOPTS=		--prefix=$(STAGING_TOOLS) \
 			--build=$(GNU_HOST_NAME) \
 			--host=$(GNU_HOST_NAME) \
@@ -26,14 +19,9 @@ GCC_CONFOPTS=		--prefix=$(STAGING_TOOLS) \
 			--disable-biarch \
 			--disable-multilib \
 			--disable-sjlj-exceptions \
+			--disable-libssp \
 			--disable-nls 
 
-ifeq ($(ADK_SSP),y)
-GCC_CONFOPTS+=		--enable-libssp
-else
-GCC_CONFOPTS+=		--disable-libssp
-endif
-
 ifeq ($(ADK_TARGET_NO_FPU),y)
 GCC_CONFOPTS+=		--with-float=soft
 endif
@@ -108,7 +96,7 @@ $(GCC_BUILD_DIR_FINAL)/.configured:
 		PATH=$(TARGET_PATH) \
 		$(WRKBUILD)/configure \
 			${GCC_CONFOPTS} \
-			--enable-languages=$(TARGET_LANGUAGES) \
+			--enable-languages=c,c++ \
 			--with-sysroot=$(STAGING_DIR) \
 			--with-slibdir=$(STAGING_DIR)/lib \
 			--enable-shared \

toolchain/uClibc/Makefile

@@ -21,19 +21,6 @@ $(WRKBUILD)/.headers:
 	$(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak
 	sed -e 's
^KERNEL_HEADERS.*$$
KERNEL_HEADERS=\"${TOOLCHAIN_SYSROOT}/usr/include\"
' \
 	    $(TOPDIR)/target/$(ADK_TARGET)/uclibc.config >${WRKBUILD}/.config
-ifeq ($(ADK_IPV6),y)
-	$(SED) 's,# UCLIBC_HAS_IPV6.*,UCLIBC_HAS_IPV6=y,' \
-		${WRKBUILD}/.config
-endif
-ifeq ($(ADK_SSP),y)
-	$(SED) 's,# UCLIBC_HAS_SSP.*,UCLIBC_HAS_SSP=y,' \
-		${WRKBUILD}/.config
-	echo 'UCLIBC_BUILD_SSP=y' >> ${WRKBUILD}/.config
-	echo '# UCLIBC_HAS_SSP_COMPAT is not set' >> ${WRKBUILD}/.config
-	echo '# SSP_QUICK_CANARY is not set' >> ${WRKBUILD}/.config
-	echo 'PROPOLICE_BLOCK_ABRT=y' >> ${WRKBUILD}/.config
-	echo '# PROPOLICE_BLOCK_SEGV is not set' >> ${WRKBUILD}/.config
-endif
 ifneq ($(ADK_DEBUG),)
 	$(SED) 's,DOSTRIP,DODEBUG,' ${WRKBUILD}/.config
 endif