fix potential build errors when changing the qc-usb package selection

[openwrt/openwrt.git] / package / qc-usb / Makefile

diff --git a/package/qc-usb/Makefile b/package/qc-usb/Makefile
index a1a16b34cb4f000b0fd5f3bec333be034fdce709..47afc8c28bbb7ff151d09e46cd3a00e34af3f8ec 100644 (file)
--- a/package/qc-usb/Makefile
+++ b/package/qc-usb/Makefile
@@ -38,8 +38,8 @@ endef
 define KernelPackage/video-quickcam
 $(call Package/qc-usb/Default)
   SUBMENU:=Video Support
-  TITLE:=USB QuickCam Express webcam support
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core
+  TITLE:=QuickCam Express USB webcam support
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core kmod-video-core
   FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,quickcam)
 endef
@@ -49,23 +49,24 @@ define KernelPackage/video-quickcam/description
  with similar chipsets.
 endef
 
-ifneq ($(CONFIG_PACKAGE_kmod-video-quickcam),)
-  define Build/Compile/kmod
-       $(MAKE) -C $(LINUX_DIR) \
-               PATH="$(TARGET_PATH)" \
-                KVER="$(LINUX_VERSION)" \
-               KERNELRELEASE="$(LINUX_VERSION)" \
-                KSRC="$(LINUX_DIR)" \
-                SUBDIRS="$(PKG_BUILD_DIR)" \
-                KERNEL_DIR="$(KERNEL_DIR)" \
-                ARCH="$(LINUX_KARCH)" \
-                CROSS_COMPILE="$(TARGET_CROSS)" \
-               modules
-  endef
+ifeq ($(KERNEL),2.4)
+  ifeq ($(LINUX_KARCH),i386)
+    KERNEL_C_OPTS:= -Os -mpreferred-stack-boundary=2 -march=i486 -fno-unit-at-a-time
+  endif
+  ifeq ($(LINUX_KARCH),mips)
+    KERNEL_C_OPTS:= -Os -G 0 -mlong-calls -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap
+  endif
 endif
 
 define Build/Compile
-       $(call Build/Compile/kmod)
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               LINUX_DIR="$(LINUX_DIR)" \
+               ARCH="$(LINUX_KARCH)" \
+               CROSS_COMPILE="$(TARGET_CROSS)" \
+               CC="$(TARGET_CC)" \
+               LD="$(TARGET_CC) -nodefaultlibs -nostartfiles" \
+               USER_OPT="$(KERNEL_C_OPTS)" \
+               quickcam.$(LINUX_KMOD_SUFFIX)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CFLAGS="$(TARGET_CFLAGS)" \
                qcset