From 86ada69f32491de2415d237605370e7f4e8d5e01 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Dec 2009 15:27:21 +0100
Subject: fix some cygwin issues

---
 .gitignore                         |  1 +
 mk/build.mk                        |  5 ++++-
 package/cbtt/Makefile              | 10 ++++++----
 package/collectd/Makefile          |  1 +
 package/freeradius-server/Makefile |  2 ++
 package/ulogd/Makefile             |  2 ++
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index d82d1dc4a..aec87fdd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 config/conf
 config/conf.exe
+config/a.exe
 config/lex.backup
 config/lex.zconf.c
 config/lkc_defs.h
diff --git a/mk/build.mk b/mk/build.mk
index e8309afba..b8743089c 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -167,7 +167,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
 
 #############################################################
@@ -310,6 +310,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 \
diff --git a/package/cbtt/Makefile b/package/cbtt/Makefile
index 569fd9916..2062528ca 100644
--- a/package/cbtt/Makefile
+++ b/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
 
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 222f46ab3..24d337b1d 100644
--- a/package/collectd/Makefile
+++ b/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'
diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index 6d58d3f85..69f19397c 100644
--- a/package/freeradius-server/Makefile
+++ b/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
diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile
index 30c170749..eb539ab31 100644
--- a/package/ulogd/Makefile
+++ b/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}))
-- 
cgit v1.2.3