diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/Depends.mk | 2 | ||||
| -rw-r--r-- | package/cfgfs/Config.in | 1 | ||||
| -rw-r--r-- | package/cfinstall/Config.in | 1 | ||||
| -rw-r--r-- | package/dansguardian/Config.in | 3 | ||||
| -rw-r--r-- | package/dansguardian/Makefile | 2 | ||||
| -rw-r--r-- | package/iproute2/Makefile | 10 | ||||
| -rw-r--r-- | package/iproute2/patches/patch-Makefile | 4 |
7 files changed, 14 insertions, 9 deletions
diff --git a/package/Depends.mk b/package/Depends.mk index 4f830e74b..627c8a46c 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -30,7 +30,7 @@ ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) cxxtools-compile: uclibc++-compile endif cyrus-sasl-compile: openssl-compile -dansguardian-compile: pcre-compile +dansguardian-compile: pcre-compile zlib-compile ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},) davfs2-compile: fuse-compile endif diff --git a/package/cfgfs/Config.in b/package/cfgfs/Config.in index c187a5eb1..15fb4782f 100644 --- a/package/cfgfs/Config.in +++ b/package/cfgfs/Config.in @@ -6,6 +6,7 @@ config ADK_PACKAGE_CFGFS select BUSYBOX_FEATURE_SORT_BIG depends on \ ADK_LINUX_X86_ALIX1C || \ + ADK_LINUX_X86_ALIX2D || \ ADK_LINUX_X86_WRAP || \ ADK_LINUX_CRIS_FOXBOARD || \ ADK_LINUX_MIPS_RB532 diff --git a/package/cfinstall/Config.in b/package/cfinstall/Config.in index 18a73344b..4914a51a2 100644 --- a/package/cfinstall/Config.in +++ b/package/cfinstall/Config.in @@ -5,6 +5,7 @@ config ADK_PACKAGE_CFINSTALL select ADK_PACKAGE_PARTED depends on \ ADK_LINUX_X86_ALIX1C || \ + ADK_LINUX_X86_ALIX2D || \ ADK_LINUX_X86_WRAP || \ ADK_LINUX_MIPS_RB532 default n diff --git a/package/dansguardian/Config.in b/package/dansguardian/Config.in index 2a12515ee..9107e2676 100644 --- a/package/dansguardian/Config.in +++ b/package/dansguardian/Config.in @@ -1,8 +1,9 @@ config ADK_PACKAGE_DANSGUARDIAN - prompt "dansguardian......................... web content filter proxy" + prompt "dansguardian...................... web content filter proxy" tristate depends on ADK_CXX select ADK_PACKAGE_LIBPCRE + select ADK_PACKAGE_ZLIB default n help http://dansguardian.org diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index 4e1ef09e6..69d86719a 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 0987a1c9bfbdf398118386f10279611a PKG_DESCR:= web content filter proxy PKG_SECTION:= net -PKG_DEPENDS:= libpcre +PKG_DEPENDS:= libpcre zlib PKG_URL:= http://dansguardian.org PKG_SITES:= http://dansguardian.org/downloads/2/Stable/ diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 5195693c0..6dcc3947a 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -35,11 +35,13 @@ $(eval $(call PKG_template,ROUTEL,routel,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP $(eval $(call PKG_template,RTMON,rtmon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_RTMON},${PKG_DESCR_RTMON},${PKG_SECTION})) $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_SS},${PKG_DESCR_SS},${PKG_SECTION})) -CONFIGURE_STYLE= gnu +TCFLAGS+= -D_GNU_SOURCE +XAKE_FLAGS+= CCOPTS="${TCFLAGS}" MFLAGS="CC=${TARGET_CC}" + +CONFIGURE_STYLE:= gnu CONFIGURE_FLAGS+= KERNEL_INCLUDE="${LINUX_DIR}/include" -MAKE_FLAGS+= MFLAGS="CC=${TARGET_CC}" -BUILD_STYLE= auto -INSTALL_STYLE= auto +BUILD_STYLE:= auto +INSTALL_STYLE:= auto INSTALL_y:= INSTALL_m:= diff --git a/package/iproute2/patches/patch-Makefile b/package/iproute2/patches/patch-Makefile index 194162a87..841c6f32e 100644 --- a/package/iproute2/patches/patch-Makefile +++ b/package/iproute2/patches/patch-Makefile @@ -4,7 +4,7 @@ used to compile host-utils in netem/ - define LIBUTIL for misc/ss to compile correctly --- iproute2-2.6.29-1.orig/Makefile 2009-03-24 23:40:54.000000000 +0100 -+++ iproute2-2.6.29-1/Makefile 2009-08-22 02:42:31.939603104 +0200 ++++ iproute2-2.6.29-1/Makefile 2009-11-25 08:59:58.000000000 +0100 @@ -20,10 +20,10 @@ ADDLIB+=dnet_ntop.o dnet_pton.o #options for ipx ADDLIB+=ipx_ntop.o ipx_pton.o @@ -15,7 +15,7 @@ -CFLAGS = $(CCOPTS) -I../include $(DEFINES) +CC := gcc +HOSTCC := gcc -+CCOPTS := -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall ++CCOPTS ?= -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall +CFLAGS = $(CCOPTS) -I../include $(DEFINES) ${TARGET_CFLAGS} YACCFLAGS = -d -t -v |