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

.gitignore

@@ -1,5 +1,6 @@
 config/conf
 config/conf.exe
+config/a.exe
 config/lex.backup
 config/lex.zconf.c
 config/lkc_defs.h

mk/build.mk

@@ -168,7 +168,7 @@ switch:
 
 kernelconfig:
 	cp $(TOPDIR)/target/$(ADK_TARGET)/kernel.config $(BUILD_DIR)/linux/.config
-	make -C $(BUILD_DIR)/linux/ ARCH=$(ARCH) menuconfig
+	$(MAKE) -C $(BUILD_DIR)/linux/ ARCH=$(ARCH) menuconfig
 	cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADK_TARGET)/kernel.config
 
 #############################################################
@@ -311,6 +311,9 @@ ifeq (${OStype},OpenBSD)
 endif
 ifeq (${OStype},NetBSD)
 	@echo ADK_HOST_NETBSD=y > $(TOPDIR)/all.config
+endif
+ifneq (,$(filter CYGWIN%,${OStype}))
+	@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/all.config
 endif
 	@if [ ! -z "$(TARGET)" ];then \
 		grep "^config" target/Config.in \

package/cbtt/Makefile

@@ -6,17 +6,19 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		cbtt
 PKG_VERSION:=		20060211
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		mysql zlib
-ifeq (${ADK_COMPILE_CBTT_WITH_UCLIBCXX},y)
-PKG_BUILDDEP+=		uclibc++
-endif
 PKG_MD5SUM:=		19abea2817c49ccc9438e9671c402984
 PKG_DESCR:=		Bittorrent tracker
 PKG_SECTION:=		net
 PKG_DEPENDS:=		zlib
+PKG_BUILDDEP+=		mysql zlib
+ifeq (${ADK_COMPILE_CBTT_WITH_UCLIBCXX},y)
+PKG_BUILDDEP+=		uclibc++
+endif
 PKG_URL:=		http://bnbtusermods.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=bnbtusermods/}
 
+PKG_HOST_DEPENDS:=	!cygwin
+
 PKG_DESCR_1:=		Bittorrent tracker with mysql support
 PKG_DEPENDS_1:=		${PKG_DEPENDS} libmysqlclient
 

package/collectd/Makefile

@@ -93,6 +93,7 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--enable-wireless \
 			--with-fp-layout=nothing \
 			--without-java \
+			--without-libiptc \
 			--with-nan-emulation
 
 XAKE_FLAGS+=		LIBS='-lm'

package/freeradius-server/Makefile

@@ -29,6 +29,8 @@ PKG_SITES:=		ftp://ftp.freeradius.org/pub/radius/ \
 			http://freeradius.portal-to-web.de/ \
 			ftp://ftp.uk.freeradius.org/pub/radius/
 
+PKG_HOST_DEPENDS:=	!cygwin
+
 PKG_DESCR_DEMOCERTS:=	Demo certificates to test the server
 PKG_DESCR_CHAP:=	CHAP authentication module
 PKG_DESCR_DETAIL:=	Detailed accounting module

package/ulogd/Makefile

@@ -33,6 +33,8 @@ PKG_SITES:=		ftp://ftp.netfilter.org/pub/ulogd/ \
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+PKG_HOST_DEPENDS:=	!cygwin
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ULOGD,ulogd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))