projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[backfire] backport r27648
[openwrt-10.03/.git]
/
include
/
package-defaults.mk
diff --git
a/include/package-defaults.mk
b/include/package-defaults.mk
index 1553f2f0d14b15937edc3ca3fd7b08208fd1a6cc..ef51710b9d8d84c8b357d96e2c7156cba83b4c42 100644
(file)
--- a/
include/package-defaults.mk
+++ b/
include/package-defaults.mk
@@
-23,7
+23,16
@@
define Package/Default
else
VERSION:=$(PKG_RELEASE)
endif
else
VERSION:=$(PKG_RELEASE)
endif
- PKGARCH:=$(ARCH)
+ ifneq ($(PKG_FLAGS),)
+ PKGFLAGS:=$(PKG_FLAGS)
+ else
+ PKGFLAGS:=
+ endif
+ ifneq ($(ARCH_PACKAGES),)
+ PKGARCH:=$(ARCH_PACKAGES)
+ else
+ PKGARCH:=$(BOARD)
+ endif
PRIORITY:=optional
DEFAULT:=
MENU:=
PRIORITY:=optional
DEFAULT:=
MENU:=
@@
-33,6
+42,7
@@
define Package/Default
KCONFIG:=
BUILDONLY:=
URL:=
KCONFIG:=
BUILDONLY:=
URL:=
+ VARIANT:=
endef
Build/Patch:=$(Build/Patch/Default)
endef
Build/Patch:=$(Build/Patch/Default)
@@
-60,7
+70,9
@@
CONFIGURE_ARGS = \
--localstatedir=/var \
--mandir=$(CONFIGURE_PREFIX)/man \
--infodir=$(CONFIGURE_PREFIX)/info \
--localstatedir=/var \
--mandir=$(CONFIGURE_PREFIX)/man \
--infodir=$(CONFIGURE_PREFIX)/info \
- $(DISABLE_NLS)
+ $(DISABLE_NLS) \
+ $(DISABLE_LARGEFILE) \
+ $(DISABLE_IPV6)
CONFIGURE_VARS = \
$(TARGET_CONFIGURE_OPTS) \
CONFIGURE_VARS = \
$(TARGET_CONFIGURE_OPTS) \
@@
-70,7
+82,7
@@
CONFIGURE_VARS = \
LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
CONFIGURE_PATH = .
LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
CONFIGURE_PATH = .
-CONFIGURE_CMD =
$(CONFIGURE_PATH)
/configure
+CONFIGURE_CMD =
.
/configure
replace_script=$(FIND) $(1) -name $(2) | $(XARGS) chmod u+w; $(FIND) $(1) -name $(2) | $(XARGS) -n1 cp $(SCRIPT_DIR)/$(2);
replace_script=$(FIND) $(1) -name $(2) | $(XARGS) chmod u+w; $(FIND) $(1) -name $(2) | $(XARGS) -n1 cp $(SCRIPT_DIR)/$(2);
@@
-115,7
+127,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