X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=include%2Fpackage-defaults.mk;h=1d29119d81fab0aba0a8f3eab81c430ae99000af;hp=1553f2f0d14b15937edc3ca3fd7b08208fd1a6cc;hb=1162dfde8232320637b28cc2b0ac3fc97393dab1;hpb=6f297036252df477192eddf95728c9933df4d7db diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 1553f2f0d1..1d29119d81 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -23,7 +23,16 @@ define Package/Default 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:= @@ -33,12 +42,13 @@ define Package/Default KCONFIG:= BUILDONLY:= URL:= + VARIANT:= endef Build/Patch:=$(Build/Patch/Default) ifneq ($(strip $(PKG_UNPACK)),) define Build/Prepare/Default - $(PKG_UNPACK) + $(SH_FUNC) $(PKG_UNPACK) $(Build/Patch) endef endif @@ -60,7 +70,9 @@ CONFIGURE_ARGS = \ --localstatedir=/var \ --mandir=$(CONFIGURE_PREFIX)/man \ --infodir=$(CONFIGURE_PREFIX)/info \ - $(DISABLE_NLS) + $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ + $(DISABLE_IPV6) CONFIGURE_VARS = \ $(TARGET_CONFIGURE_OPTS) \ @@ -70,7 +82,7 @@ CONFIGURE_VARS = \ 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); @@ -106,7 +118,7 @@ MAKE_PATH = . 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 @@ -115,7 +127,7 @@ define Build/Install/Default $(MAKE_VARS) \ $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ $(MAKE_INSTALL_FLAGS) \ - $(1) install; + $(if $(1), $(1), install); endef define Build/Dist/Default