ramips: add support for the ARC FreeStation5 board, also fix WCR-150GN network setup...

[openwrt.git] / include / package-defaults.mk

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 2b5cb86..7544292 100644 (file)
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -10,6 +10,7 @@ define Package/Default
   SECTION:=opt
   CATEGORY:=Extra packages
   DEPENDS:=
   SECTION:=opt
   CATEGORY:=Extra packages
   DEPENDS:=

+  MDEPENDS:=

   PROVIDES:=
   EXTRA_DEPENDS:=
   MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>
   PROVIDES:=
   EXTRA_DEPENDS:=
   MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>


@@ -23,10 +24,15 @@ define Package/Default
   else
     VERSION:=$(PKG_RELEASE)
   endif
   else
     VERSION:=$(PKG_RELEASE)
   endif

-  ifneq ($(CONFIG_TARGET_adm5120),y)
-    PKGARCH:=$(BOARD)
+  ifneq ($(PKG_FLAGS),)
+    PKGFLAGS:=$(PKG_FLAGS)
+  else
+    PKGFLAGS:=
+  endif
+  ifneq ($(ARCH_PACKAGES),)
+    PKGARCH:=$(ARCH_PACKAGES)

   else
   else

-    PKGARCH:=$(BOARD)_$(ARCH)
+    PKGARCH:=$(BOARD)

   endif
   PRIORITY:=optional
   DEFAULT:=
   endif
   PRIORITY:=optional
   DEFAULT:=


@@ -36,17 +42,21 @@ define Package/Default
   TITLE:=
   KCONFIG:=
   BUILDONLY:=
   TITLE:=
   KCONFIG:=
   BUILDONLY:=

+  HIDDEN:=

   URL:=
   URL:=

+  VARIANT:=

 endef
 
 Build/Patch:=$(Build/Patch/Default)
 ifneq ($(strip $(PKG_UNPACK)),)
   define Build/Prepare/Default
 endef
 
 Build/Patch:=$(Build/Patch/Default)
 ifneq ($(strip $(PKG_UNPACK)),)
   define Build/Prepare/Default

-       $(PKG_UNPACK)
+       $(PKG_UNPACK)

        $(Build/Patch)
   endef
 endif
 
        $(Build/Patch)
   endef
 endif
 

+EXTRA_CXXFLAGS = $(EXTRA_CFLAGS)
+

 CONFIGURE_PREFIX:=/usr
 CONFIGURE_ARGS = \
                --target=$(GNU_TARGET_NAME) \
 CONFIGURE_PREFIX:=/usr
 CONFIGURE_ARGS = \
                --target=$(GNU_TARGET_NAME) \


@@ -71,7 +81,7 @@ CONFIGURE_ARGS = \
 CONFIGURE_VARS = \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
 CONFIGURE_VARS = \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \

-               CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+               CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CFLAGS)" \

                CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
                LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
 
                CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
                LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
 


@@ -96,7 +106,7 @@ endef
 
 MAKE_VARS = \
        CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
 
 MAKE_VARS = \
        CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \

-       CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
+       CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \

        LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)"
 
 MAKE_FLAGS = \
        LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)"
 
 MAKE_FLAGS = \


@@ -112,7 +122,7 @@ MAKE_PATH = .
 
 define Build/Compile/Default
        $(MAKE_VARS) \
 
 define Build/Compile/Default
        $(MAKE_VARS) \

-       $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \

                $(MAKE_FLAGS) \
                $(1);
 endef
                $(MAKE_FLAGS) \
                $(1);
 endef


@@ -121,7 +131,7 @@ define Build/Install/Default
        $(MAKE_VARS) \
        $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
                $(MAKE_INSTALL_FLAGS) \
        $(MAKE_VARS) \
        $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
                $(MAKE_INSTALL_FLAGS) \

-               $(1) install;
+               $(if $(1), $(1), install);

 endef
 
 define Build/Dist/Default
 endef
 
 define Build/Dist/Default