Browse Source

some patches found via make bulkallmod

Waldemar Brodkorb 13 years ago
parent
commit
cf5ef7c683

+ 1 - 1
Config.in

@@ -35,7 +35,7 @@ config ADK_CHOOSE_TARGET_SYSTEM
 source "target/config/Config.in"
 
 menu "Runtime configuration"
-depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
+depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
 source "target/config/Config.in.runtime"
 endmenu
 

+ 2 - 0
package/exmap/Makefile

@@ -13,6 +13,8 @@ PKG_DEPENDS:=		exmap-kmod libreadline glib
 PKG_BUILDDEP:=		glib readline
 PKG_SITES:=		http://labs.o-hand.com/sources/exmap-console/
 
+PKG_CFLINE_EXMAP:=	depends on !ADK_TOOLCHAIN_ONLY
+
 PKG_SUBPKGS:=		EXMAP EXMAPD EXMAPSERVER EXMAP_KMOD
 PKGSD_EXMAPD:=		memory analysing daemon
 PKGSD_EXMAPSERVER:=	memory analysing server

+ 3 - 4
package/gmediaserver/Makefile

@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		c422de386331e2a1a859d45f6fa270a3
 PKG_DESCR:=		An UPnP music media server
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		id3lib libupnp
-PKG_BUILDDEP:=		id3lib libupnp
+PKG_DEPENDS:=		id3lib libupnp libiconv
+PKG_BUILDDEP:=		id3lib libupnp libiconv
 PKG_URL:=		http://www.gnu.org/software/gmediaserver
 PKG_SITES:=		http://savannah.nongnu.org/download/gmediaserver/
 
@@ -18,8 +18,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		LIBS=" -lixml -lthreadutil -lupnp -lz" \
-			am_cv_func_iconv=no
+CONFIGURE_ENV+=		LIBS=" -lixml -lthreadutil -lupnp -lz"
 CONFIGURE_ARGS+=	--with-id3lib="${STAGING_TARGET_DIR}/usr" \
 			--with-libupnp="${STAGING_TARGET_DIR}/usr"
 

+ 1 - 0
package/ipsec-tools/Makefile

@@ -14,6 +14,7 @@ PKG_BUILDDEP:=		openssl
 PKG_URL:=		http://ipsec-tools.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ipsec-tools/}
 
+PKG_CFLINE_IPSEC_TOOLS:=depends on !ADK_TOOLCHAIN_ONLY
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 PKG_FLAVOURS_IPSEC_TOOLS:=	WITH_IPV6

+ 3 - 0
package/ipset/Makefile

@@ -12,6 +12,9 @@ PKG_SECTION:=		firewall
 PKG_URL:=		http://ipset.netfilter.org/
 PKG_SITES:=		http://ipset.netfilter.org/
 
+PKG_ARCH_DEPENDS:=	!arm
+PKG_CFLINE_IPSET:=	depends on !ADK_TOOLCHAIN_ONLY
+
 PKG_SUBPKGS:=		IPSET IPSET_KMOD
 PKGSD_IPSET_KMOD:=	ipset kernel module
 PKGSC_IPSET_KMOD:=	kernel

+ 2 - 0
package/qemu/Makefile

@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		zlib sdl
 PKG_URL:=		http://wwww.qemu.org/
 PKG_SITES:=		http://wiki.qemu.org/download/
 
+PKG_ARCH_DEPENDS:=	x86 x86_64
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,QEMU,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

+ 2 - 0
package/rtsp/Makefile

@@ -11,6 +11,8 @@ PKG_DESCR:=		connection tracking for RTSP
 PKG_SECTION:=		kernel
 PKG_URL:=		http://github.com/maru-sama/rtsp-linux-v2.6
 
+PKG_CFLINE_RTSP:=	depends on !ADK_TOOLCHAIN_ONLY
+
 NO_DISTFILES:=          1
 
 include ${TOPDIR}/mk/package.mk

+ 1 - 1
package/util-linux-ng/Makefile

@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=	--disable-use-tty-group \
 			--disable-schedutils \
 			--disable-cramfs \
 			--disable-libuuid \
-			--enable-libblkid \
+			--disable-libblkid \
 			--enable-libmount \
 			--enable-mount
 MAKE_FLAGS+=		OPT="${TARGET_CFLAGS}" ARCH="${ARCH}"

+ 1 - 1
target/armeb/uclibc.config

@@ -99,7 +99,7 @@ UCLIBC_CTOR_DTOR=y
 UCLIBC_HAS_THREADS_NATIVE=y
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_TLS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set