summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/modules.mk8
-rw-r--r--package/Makefile3
-rw-r--r--package/MesaLib/Makefile1
-rw-r--r--package/dillo/Makefile2
-rw-r--r--package/fltk/Makefile3
-rw-r--r--package/freeglut/Makefile5
-rw-r--r--package/lynx/Makefile2
-rw-r--r--package/postgresql/Makefile1
-rw-r--r--package/python2/Makefile2
-rw-r--r--package/rarpd/Makefile2
-rw-r--r--package/rpm/Makefile5
-rw-r--r--package/uclibc++/patches/patch-include_unwind-cxx_h32
12 files changed, 41 insertions, 25 deletions
diff --git a/mk/modules.mk b/mk/modules.mk
index c7c81c7aa..032f0a85c 100644
--- a/mk/modules.mk
+++ b/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))
diff --git a/package/Makefile b/package/Makefile
index 4c8e63b92..d9a015494 100644
--- a/package/Makefile
+++ b/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))
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index ccf122e29..4d82687ee 100644
--- a/package/MesaLib/Makefile
+++ b/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
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index 9c6334f70..59f0ac281 100644
--- a/package/dillo/Makefile
+++ b/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}))
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index 66a6bbff3..c08d8d21a 100644
--- a/package/fltk/Makefile
+++ b/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}))
diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile
index fada37f67..6d5bdb921 100644
--- a/package/freeglut/Makefile
+++ b/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}))
diff --git a/package/lynx/Makefile b/package/lynx/Makefile
index 410c4e1e4..ab9215be6 100644
--- a/package/lynx/Makefile
+++ b/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
diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index 56e293b18..2b178e2e6 100644
--- a/package/postgresql/Makefile
+++ b/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}
diff --git a/package/python2/Makefile b/package/python2/Makefile
index c9edbcd42..02e54ba93 100644
--- a/package/python2/Makefile
+++ b/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}
diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile
index 58eed4598..4dfd18dea 100644
--- a/package/rarpd/Makefile
+++ b/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
diff --git a/package/rpm/Makefile b/package/rpm/Makefile
index fa931b5ba..88a0954a1 100644
--- a/package/rpm/Makefile
+++ b/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}))
diff --git a/package/uclibc++/patches/patch-include_unwind-cxx_h b/package/uclibc++/patches/patch-include_unwind-cxx_h
index 948c127bc..7cf6d1db9 100644
--- a/package/uclibc++/patches/patch-include_unwind-cxx_h
+++ b/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 08:07:40 +0000