diff options
80 files changed, 71 insertions, 250 deletions
@@ -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 diff --git a/mk/build.mk b/mk/build.mk index 66f76f748..aa97026cb 100644 --- a/mk/build.mk +++ b/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 \ diff --git a/mk/package.mk b/mk/package.mk index 4249cedae..df2c027b2 100644 --- a/mk/package.mk +++ b/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})' \ diff --git a/package/6tunnel/Config.in b/package/6tunnel/Config.in index 53b69c2d5..c3cdb3cbe 100644 --- a/package/6tunnel/Config.in +++ b/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 diff --git a/package/Config.in b/package/Config.in index 3822ef243..e879e8288 100644 --- a/package/Config.in +++ b/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 diff --git a/package/Depends.mk b/package/Depends.mk index 627c8a46c..277ab22da 100644 --- a/package/Depends.mk +++ b/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 diff --git a/package/aiccu/Config.in b/package/aiccu/Config.in index 202d3c1c6..1dbda660b 100644 --- a/package/aiccu/Config.in +++ b/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 diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index a86cbb921..e92957f05 100644 --- a/package/bitlbee/Makefile +++ b/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: diff --git a/package/bogofilter/Config.in b/package/bogofilter/Config.in index 922f17376..982cb9828 100644 --- a/package/bogofilter/Config.in +++ b/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 diff --git a/package/cbtt/Config.in b/package/cbtt/Config.in index 25b51c6da..789f613dd 100644 --- a/package/cbtt/Config.in +++ b/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 diff --git a/package/ctorrent/Config.in b/package/ctorrent/Config.in index fa6f355d5..8a6562061 100644 --- a/package/ctorrent/Config.in +++ b/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 diff --git a/package/cxxtools/Config.in b/package/cxxtools/Config.in index 566d2e6cb..d7dcdb87d 100644 --- a/package/cxxtools/Config.in +++ b/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 diff --git a/package/dansguardian/Config.in b/package/dansguardian/Config.in index 9107e2676..2bffe7da6 100644 --- a/package/dansguardian/Config.in +++ b/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 diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile index 38cce03ce..f7b590cb0 100644 --- a/package/dhcp/Makefile +++ b/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 diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 711a575fc..21c4ba847 100644 --- a/package/dnsmasq/Makefile +++ b/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 diff --git a/package/freeradius-server/Config.in b/package/freeradius-server/Config.in index d7dc0cb03..fe119c0a3 100644 --- a/package/freeradius-server/Config.in +++ b/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 diff --git a/package/gmediaserver/Config.in b/package/gmediaserver/Config.in index fc256a0cd..ade3b4a1c 100644 --- a/package/gmediaserver/Config.in +++ b/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 diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index f0c274449..9687145a5 100644 --- a/package/gpsd/Config.in +++ b/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 diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index 5be7b5776..4af746246 100644 --- a/package/heimdal/Makefile +++ b/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 diff --git a/package/id3lib/Config.in b/package/id3lib/Config.in index ab45259f1..dde87347c 100644 --- a/package/id3lib/Config.in +++ b/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 diff --git a/package/iperf/Config.in b/package/iperf/Config.in index bdfee6913..3f5c8d323 100644 --- a/package/iperf/Config.in +++ b/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 diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 412730cd6..b8e1df9c2 100644 --- a/package/iptables/Makefile +++ b/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 diff --git a/package/kismet/Config.in b/package/kismet/Config.in index 2583f88d2..1c29a85d7 100644 --- a/package/kismet/Config.in +++ b/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 promp |