fix make bulkallmod for some packages and target combinations

mk/build.mk

@@ -13,7 +13,8 @@ CONFIG = config
 DEFCONFIG=		ADK_DEVELSYSTEM=n \
 			ADK_DEBUG=n \
 			ADK_STATIC=n \
-			ADK_MAKE_PARALLEL=n \
+			ADK_MAKE_PARALLEL=y \
+			ADK_MAKE_JOBS=4 \
 			ADK_FORCE_PARALLEL=n \
 			ADK_PACKAGE_GRUB=n \
 			ADK_PACKAGE_XORG_SERVER_WITH_DRI=n \

package/gdb/Makefile

@@ -10,6 +10,8 @@ PKG_DEPENDS:=		libthread-db libncurses libiconv
 PKG_BUILDDEP+=		ncurses readline libiconv
 PKG_TARGET_DEPENDS:=	!foxboard !ag241
 
+PKG_NOPARALLEL:=	1
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/gdbserver/Makefile

@@ -8,6 +8,8 @@ PKG_DESCR:=		GNU debugger (small server)
 PKG_SECTION:=		comp
 PKG_DEPENDS:=		libthread-db
 
+PKG_TARGET_DEPENDS:=    !foxboard 
+
 include ${TOPDIR}/mk/package.mk
 
 WRKSRC=                 ${WRKDIST}/gdb/gdbserver

package/nspr/Makefile

@@ -20,7 +20,12 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,NSPR,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		OS_TARGET="Linux" HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}"
+CONFIGURE_ENV+=		OS_TARGET="Linux" HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \
+			cross_compiling=yes
+
+ifeq (${ADK_LINUX_64},y)
+CONFIGURE_ARGS+=	--enable-64bit
+endif
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_NSPR)/usr/lib

package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in

@@ -1,11 +1,11 @@
 --- nspr-4.8.2.orig/mozilla/nsprpub/config/Makefile.in	2009-03-03 23:04:23.000000000 +0100
-+++ nspr-4.8.2/mozilla/nsprpub/config/Makefile.in	2010-02-06 02:01:27.321836181 +0100
++++ nspr-4.8.2/mozilla/nsprpub/config/Makefile.in	2010-05-02 12:25:27.673464050 +0200
 @@ -145,7 +145,7 @@ endif
  
  $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
  	@$(MAKE_OBJDIR)
 -	$(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
-+	$(CC_FOR_BUILD) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
++	$(CC_FOR_BUILD) $(HOSTCFLAGS) $< $(HOSTLDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
  
  install:: nspr.m4
  	$(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal

package/nspr/patches/patch-mozilla_nsprpub_configure

@@ -0,0 +1,21 @@
+--- nspr-4.8.2.orig/mozilla/nsprpub/configure	2009-10-04 02:57:00.000000000 +0200
++++ nspr-4.8.2/mozilla/nsprpub/configure	2010-05-02 12:55:21.842224375 +0200
+@@ -1129,8 +1129,8 @@ EOF
+ fi
+ 
+ if test -z "$SKIP_COMPILER_CHECKS"; then
+-if test "$target" != "$host"; then
+-    echo "cross compiling from $host to $target"
++if test "$target" != "$build"; then
++    echo "cross compiling from $build to $target"
+     cross_compiling=yes
+ 
+     _SAVE_CC="$CC"
+@@ -2593,6 +2593,7 @@ case "$build:$target" in
+         ;;
+ esac
+ 
++cross_compiling=yes
+ if test "$cross_compiling"  = "yes"; then
+     CROSS_COMPILE=1
+ else

package/nss/Makefile

@@ -26,7 +26,7 @@ CONFIG_STYLE:=		manual
 
 ifeq ($(ADK_LINUX_64),y)
 TCFLAGS+=		-DUSE_64
-MAKE_FLAGS+=		USE_64=1
+XAKE_FLAGS+=		USE_64=1
 endif
 
 MAKE_FLAGS+=		NATIVE_CC="${HOSTCC}" NATIVE_FLAGS="${HOSTCFLAGS}"
@@ -34,10 +34,10 @@ TCPPFLAGS+=		-I${STAGING_DIR}/usr/include/nspr
 TCFLAGS+=		-I${STAGING_DIR}/usr/include/nspr
 TLDFLAGS:=		''
 
-MAKE_FLAGS+=		SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist \
+XAKE_FLAGS+=		SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist \
 			ARCHFLAG="${TCFLAGS} ${TCPPFLAGS} -ldl"
 ALL_TARGET:=		build_coreconf all
-XAKE_FLAGS+=		OS_TEST=${ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6
+XAKE_FLAGS+=		OS_TEST=${CPU_ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_NSS)/usr/lib

target/Config.in

@@ -238,6 +238,7 @@ config ADK_LINUX_ARM_FOXG20
 	select ADK_EABI
 	select ADK_KERNEL_NLS
 	select ADK_KERNEL_EXT2_FS
+	select ADK_KERNEL_USB
 	select ADK_KPACKAGE_KMOD_VFAT_FS
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	select ADK_KERNEL_NETDEVICES
@@ -254,6 +255,7 @@ config ADK_LINUX_CRIS_FOXBOARD
 	bool "Foxboard (ETRAX LX100)"
 	select ADK_foxboard
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
+	select ADK_KERNEL_USB
 	select ADK_KERNEL_NLS
 	select ADK_TARGET_WITH_USB
 	help
@@ -589,6 +591,7 @@ config ADK_LINUX_X86_QEMU
 config ADK_LINUX_X86_64_QEMU
 	bool "x86_64"
 	select ADK_x86_64_qemu
+	select ADK_LINUX_64
 	select ADK_KERNEL_NETDEV_1000
 	select ADK_KPACKAGE_KMOD_E1000
 	select ADK_KERNEL_INPUT_KEYBOARD

target/foxg20/uclibc.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Version: 0.9.31
-# Sun Apr  4 10:16:38 2010
+# Version: 0.9.30.3
+# Sat May  1 19:16:40 2010
 #
 # TARGET_alpha is not set
 TARGET_arm=y
@@ -69,7 +69,6 @@ UCLIBC_HAS_FLOATS=y
 # UCLIBC_HAS_FPU is not set
 UCLIBC_HAS_SOFT_FLOAT=y
 DO_C99_MATH=y
-# DO_XSI_MATH is not set
 UCLIBC_HAS_FENV=y
 KERNEL_HEADERS=""
 HAVE_DOT_CONFIG=y
@@ -89,14 +88,12 @@ LDSO_CACHE_SUPPORT=y
 LDSO_BASE_FILENAME="ld.so"
 # UCLIBC_STATIC_LDCONFIG is not set
 # LDSO_RUNPATH is not set
-LDSO_SEARCH_INTERP_PATH=y
 UCLIBC_CTOR_DTOR=y
 # LDSO_GNU_HASH_SUPPORT is not set
 # HAS_NO_THREADS is not set
-LINUXTHREADS_OLD=y
-# LINUXTHREADS_NEW is not set
 UCLIBC_HAS_THREADS=y
 PTHREADS_DEBUG_SUPPORT=y
+LINUXTHREADS_OLD=y
 UCLIBC_HAS_SYSLOG=y
 UCLIBC_HAS_LFS=y
 # MALLOC is not set
@@ -107,7 +104,6 @@ UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
 # UCLIBC_SUSV3_LEGACY_MACROS is not set
-# UCLIBC_SUSV4_LEGACY is not set
 # UCLIBC_HAS_STUBS is not set
 UCLIBC_HAS_SHADOW=y
 UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
@@ -116,7 +112,6 @@ UCLIBC_HAS_PTY=y
 ASSUME_DEVPTS=y
 UNIX98PTY_ONLY=y
 # UCLIBC_HAS_GETPT is not set
-# UCLIBC_HAS_LIBUTIL is not set
 UCLIBC_HAS_TM_EXTENSIONS=y
 UCLIBC_HAS_TZ_CACHING=y
 UCLIBC_HAS_TZ_FILE=y
@@ -158,10 +153,6 @@ UCLIBC_HAS_REENTRANT_RPC=y
 UCLIBC_USE_NETLINK=y
 UCLIBC_SUPPORT_AI_ADDRCONFIG=y
 UCLIBC_HAS_BSD_RES_CLOSE=y
-UCLIBC_HAS_COMPAT_RES_STATE=y
-# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
-# UCLIBC_HAS_LIBRESOLV_STUB is not set
-# UCLIBC_HAS_LIBNSL_STUB is not set
 
 #
 # String and Stdio Support
@@ -212,17 +203,16 @@ UCLIBC_HAS_REGEX_OLD=y
 UCLIBC_HAS_FNMATCH=y
 UCLIBC_HAS_FNMATCH_OLD=y
 UCLIBC_HAS_WORDEXP=y
-# UCLIBC_HAS_NFTW is not set
+UCLIBC_HAS_FTW=y
 UCLIBC_HAS_GLOB=y
 UCLIBC_HAS_GNU_GLOB=y
 
 #
 # Library Installation Options
 #
+SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)lib"
 RUNTIME_PREFIX="/"
 DEVEL_PREFIX="/usr/"
-MULTILIB_DIR="lib"
-HARDWIRED_ABSPATH=y
 
 #
 # Security options

target/linux/config/Config.in.misc

@@ -79,6 +79,7 @@ config ADK_KPACKAGE_KMOD_EEPROM_93CX6
 	prompt "kmod-eeprom-93cx6................. 93cx6 eeprom support"
 	tristate
 	depends on ADK_KPACKAGE_KMOD_MAC80211
+	depends on !ADK_LINUX_CRIS_FOXBOARD
 	default n
 	help
 

target/linux/config/Config.in.multimedia

@@ -1,5 +1,9 @@
 menu "Multimedia devices support"
-depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB && !ADK_LINUX_CRIS_FOXBOARD
+depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB
+
+config ADK_KERNEL_SND_AC97_CODEC
+	boolean
+	default n
 
 config ADK_KERNEL_SND_TIMER
 	boolean
@@ -56,6 +60,8 @@ config ADK_KPACKAGE_KMOD_SND_OSSEMUL
 config ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 	prompt "kmod-sound-alsa-ac97-codec..... ALSA AC97 codec"
 	depends on ADK_KPACKAGE_KMOD_SND
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 )
+	select ADK_KERNEL_SND_AC97_CODEC
 	tristate
 	default n
 	help
@@ -64,6 +70,7 @@ config ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 config ADK_KPACKAGE_KMOD_SND_VIA82XX
 	prompt "kmod-sound-alsa-via82xx........ ALSA VIA82XX driver"
 	depends on ADK_KPACKAGE_KMOD_SND
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 )
 	select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
 	tristate
 	default n
@@ -73,6 +80,7 @@ config ADK_KPACKAGE_KMOD_SND_VIA82XX
 config ADK_KPACKAGE_KMOD_SND_ENS1370
 	prompt "kmod-sound-alsa-ens1370........ ALSA Ensoniq 1370 driver"
 	depends on ADK_KPACKAGE_KMOD_SND
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 )
 	tristate
 	default n
 	help

target/linux/config/Config.in.usb

@@ -101,7 +101,7 @@ config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD
 	prompt   "kmod-usb-isp116x................ ISP116X HCD support"
 	tristate
 	default n
-	depends on !ADK_LINUX_CRIS_FOXBOARD
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20)
 	depends on ADK_KPACKAGE_KMOD_USB
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	help
@@ -114,7 +114,7 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD
 	prompt   "kmod-usb-sl811.................. SL811HS HCD support"
 	tristate
 	default n
-	depends on !ADK_LINUX_CRIS_FOXBOARD
+	depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20)
 	depends on ADK_KPACKAGE_KMOD_USB
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	help
@@ -154,7 +154,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 
 config ADK_PACKAGE_KMOD_USB_CONTROLLER
 	tristate
-	depends on ADK_KPACKAGE_KMOD_USB_UHCI_HCD || ADK_KPACKAGE_KMOD_USB_OHCI_HCD || ADK_KPACKAGE_KMOD_EHCI_HCD || ADK_LINUX_CRIS_FOXBOARD
+	depends on ADK_KPACKAGE_KMOD_USB_UHCI_HCD || ADK_KPACKAGE_KMOD_USB_OHCI_HCD || ADK_KPACKAGE_KMOD_EHCI_HCD || ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20
 	default n
 
 config ADK_KPACKAGE_KMOD_USB_ACM

target/linux/patches/2.6.33.1/cris-sound.patch

@@ -0,0 +1,12 @@
+diff -Nur linux-2.6.33.orig/arch/cris/Kconfig linux-2.6.33/arch/cris/Kconfig
+--- linux-2.6.33.orig/arch/cris/Kconfig	2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/arch/cris/Kconfig	2010-04-28 21:41:58.831386913 +0200
+@@ -677,6 +688,8 @@
+ 
+ source "fs/Kconfig"
+ 
++source "sound/Kconfig"
++
+ source "drivers/usb/Kconfig"
+ 
+ source "drivers/uwb/Kconfig"

target/linux/patches/2.6.33.2/cris-sound.patch

@@ -0,0 +1,12 @@
+diff -Nur linux-2.6.33.orig/arch/cris/Kconfig linux-2.6.33/arch/cris/Kconfig
+--- linux-2.6.33.orig/arch/cris/Kconfig	2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/arch/cris/Kconfig	2010-04-28 21:41:58.831386913 +0200
+@@ -677,6 +688,8 @@
+ 
+ source "fs/Kconfig"
+ 
++source "sound/Kconfig"
++
+ source "drivers/usb/Kconfig"
+ 
+ source "drivers/uwb/Kconfig"

target/linux/patches/2.6.33/cris-sound.patch

@@ -0,0 +1,12 @@
+diff -Nur linux-2.6.33.orig/arch/cris/Kconfig linux-2.6.33/arch/cris/Kconfig
+--- linux-2.6.33.orig/arch/cris/Kconfig	2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/arch/cris/Kconfig	2010-04-28 21:41:58.831386913 +0200
+@@ -677,6 +688,8 @@
+ 
+ source "fs/Kconfig"
+ 
++source "sound/Kconfig"
++
+ source "drivers/usb/Kconfig"
+ 
+ source "drivers/uwb/Kconfig"