Browse Source

cygwin host build patches, mostly by deactivating packages

Waldemar Brodkorb 14 years ago
parent
commit
aff84b4407

+ 6 - 2
mk/modules.mk

@@ -1081,9 +1081,13 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,sound-cs5535audio,\
 	$(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \
 ,55))
 
+V4L_COMPAT:=drivers/media/video/v4l1-compat
+ifeq ($(ADK_LINUX_64),y)
+V4L_COMPAT+=drivers/media/video/v4l2-compat-ioctl32
+endif
+
 $(eval $(call KMOD_template,VIDEO_DEV,video-dev,\
-	$(MODULES_DIR)/kernel/drivers/media/video/v4l1-compat \
-	$(MODULES_DIR)/kernel/drivers/media/video/v4l2-compat-ioctl32 \
+	$(foreach mod, $(V4L_COMPAT),$(MODULES_DIR)/kernel/$(mod)) \
 	$(MODULES_DIR)/kernel/drivers/media/video/videodev \
 ,65))
 

+ 2 - 1
package/Makefile

@@ -4,7 +4,6 @@
 # Main makefile for the packages
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/Depends.mk
 
 ifeq (${ADK_TARGET_LIB_GLIBC},y)
 package-$(ADK_PACKAGE_GLIBC) += glibc
@@ -26,6 +25,8 @@ endif
 package-$(ADK_PACKAGE_UCLIBCXX) += uclibc++
 endif
 
+include $(TOPDIR)/package/Depends.mk
+
 DOWNLOAD:=$(patsubst %,%-download,$(package-y) $(package-m))
 COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
 INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))

+ 1 - 0
package/MesaLib/Makefile

@@ -23,6 +23,7 @@ PKG_SECT_GLXGEARS:=	x11/apps
 WRKDIST=		${WRKDIR}/Mesa-${PKG_VERSION}
 
 PKG_TARGET_DEPENDS:=  	ibmx40 lemote
+PKG_HOST_DEPENDS:=	!cygwin
 
 include $(TOPDIR)/mk/package.mk
 

+ 2 - 0
package/dillo/Makefile

@@ -17,6 +17,8 @@ PKG_SITES:=		http://www.dillo.org/download/
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+PKG_HOST_DEPENDS:=	!cygwin
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DILLO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

+ 3 - 0
package/fltk/Makefile

@@ -16,6 +16,9 @@ PKG_SITES:=		http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.x-r7513.tar.bz2
 WRKDIST=		${WRKDIR}/${PKG_NAME}-2.0.x-r7513
 
+PKG_TARGET_DEPENDS:=  	ibmx40 lemote
+PKG_HOST_DEPENDS:=	!cygwin
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

+ 4 - 1
package/freeglut/Makefile

@@ -9,9 +9,12 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		39f0f2de89f399529d2b981188082218
 PKG_DESCR:=		OpenGL Utility Toolkit
 PKG_SECTION:=		libs
-PKG_URL:=		http://www.freeglut.org/
+PKG_BUILDDEP+=		MesaLib
+PKG_URL:=		http://freeglut.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=freeglut/}
 
+PKG_HOST_DEPENDS:=	!cygwin
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FREEGLUT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

+ 1 - 1
package/lynx/Makefile

@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME=		lynx
 PKG_VERSION=		2.8.7
 PKG_RELEASE=		1
-PKG_MD5SUM=		e36d70f3f09b2d502055ca67f09e363c
+PKG_MD5SUM=		124253e635f7c76bdffc47b9d036c812
 PKG_DESCR:=		Standard text browser
 PKG_SECTION:=		browser
 PKG_DEPENDS:=		libncurses libopenssl zlib

+ 1 - 0
package/postgresql/Makefile

@@ -33,6 +33,7 @@ PKG_CONFIGURE_ARGS:=\
 			--without-readline \
 			--without-bonjour \
 			--without-tcl \
+			--with-system-tzdata=${STAGING_DIR} \
 			--with-zlib="yes"
 CONFIGURE_ARGS+=	${PKG_CONFIGURE_ARGS}
 

+ 1 - 1
package/python2/Makefile

@@ -12,7 +12,7 @@ PKG_SECTION:=		lang
 PKG_URL:=		http://www.python.org
 PKG_SITES:=		http://www.python.org/ftp/python/${PKG_VERSION}/
 
-PKG_HOST_DEPENDS:=	!netbsd
+PKG_HOST_DEPENDS:=	!netbsd !openbsd !cygwin
 
 DISTFILES=		Python-${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/Python-${PKG_VERSION}

+ 1 - 1
package/rarpd/Makefile

@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		rarpd
 PKG_VERSION:=		1.1
 PKG_RELEASE:=		11
-PKG_BUILDDEP+=		libnet
 PKG_MD5SUM:=		04e2ca849e758d0b88c8281775ec3b58
 PKG_DESCR:=		Reverse ARP Daemon
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		libnet
+PKG_BUILDDEP+=		libnet
 PKG_SITES:=		ftp://ftp.dementia.org/pub/net-tools/
 
 include ${TOPDIR}/mk/package.mk

+ 3 - 2
package/rpm/Makefile

@@ -13,10 +13,11 @@ PKG_BUILDDEP+=		nss libdb
 PKG_URL:=		http://www.rpm.org
 PKG_SITES:=		http://rpm.org/releases/rpm-4.7.x/
 
-PKG_TARGET_DEPENDS:=    !foxboard
-
 DISTFILES:=		${PKG_NAME}-$(PKG_VERSION).tar.bz2
 
+PKG_TARGET_DEPENDS:=    !foxboard
+PKG_HOST_DEPENDS:=	!cygwin
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,RPM,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

+ 16 - 16
package/uclibc++/patches/patch-include_unwind-cxx_h

@@ -2,20 +2,20 @@ patch from OpenWrt
 --- uClibc++-0.2.2.orig/include/unwind-cxx.h	2007-06-04 00:51:12.000000000 +0200
 +++ uClibc++-0.2.2/include/unwind-cxx.h	2010-04-02 12:44:02.704723285 +0200
 @@ -135,6 +135,7 @@ extern std::unexpected_handler __unexpec
- 
- // This is the exception class we report -- "GNUCC++\0".
- const _Unwind_Exception_Class __gxx_exception_class
-+#ifndef __ARM_EABI_UNWINDER__
- = ((((((((_Unwind_Exception_Class) 'G' 
- 	 << 8 | (_Unwind_Exception_Class) 'N')
- 	<< 8 | (_Unwind_Exception_Class) 'U')
+ 
+ // This is the exception class we report -- "GNUCC++\0".
+ const _Unwind_Exception_Class __gxx_exception_class
++#ifndef __ARM_EABI_UNWINDER__
+ = ((((((((_Unwind_Exception_Class) 'G' 
+ 	 << 8 | (_Unwind_Exception_Class) 'N')
+ 	<< 8 | (_Unwind_Exception_Class) 'U')
 @@ -143,6 +144,9 @@ const _Unwind_Exception_Class __gxx_exce
-      << 8 | (_Unwind_Exception_Class) '+')
-     << 8 | (_Unwind_Exception_Class) '+')
-    << 8 | (_Unwind_Exception_Class) '\0');
-+#else
-+= "GNUC++";
-+#endif
- 
- // GNU C++ personality routine, Version 0.
- extern "C" _Unwind_Reason_Code __gxx_personality_v0
+      << 8 | (_Unwind_Exception_Class) '+')
+     << 8 | (_Unwind_Exception_Class) '+')
+    << 8 | (_Unwind_Exception_Class) '\0');
++#else
++= "GNUC++";
++#endif
+ 
+ // GNU C++ personality routine, Version 0.
+ extern "C" _Unwind_Reason_Code __gxx_personality_v0