X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ea9884f09cee5e23fc61ba2b02079eb07c47bb7a..1495465bb401dc696b5a85562de8aa8a6c1705db:/include/package-defaults.mk?ds=inline diff --git a/include/package-defaults.mk b/include/package-defaults.mk index f7f5bd0ef..ecc3af499 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -13,7 +13,7 @@ define Package/Default PROVIDES:= EXTRA_DEPENDS:= MAINTAINER:=OpenWrt Developers Team - SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) + SOURCE:=$(patsubst $(TOPDIR)/%,%,$(CURDIR)) ifneq ($(PKG_VERSION),) ifneq ($(PKG_RELEASE),) VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) @@ -23,7 +23,11 @@ define Package/Default else VERSION:=$(PKG_RELEASE) endif - PKGARCH:=$(ARCH) + ifneq ($(CONFIG_TARGET_adm5120),y) + PKGARCH:=$(BOARD) + else + PKGARCH:=$(BOARD)_$(ARCH) + endif PRIORITY:=optional DEFAULT:= MENU:= @@ -33,6 +37,7 @@ define Package/Default KCONFIG:= BUILDONLY:= URL:= + VARIANT:= endef Build/Patch:=$(Build/Patch/Default) @@ -43,9 +48,6 @@ ifneq ($(strip $(PKG_UNPACK)),) endef endif -export PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR_HOST)/usr/lib/pkgconfig -export PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig - CONFIGURE_PREFIX:=/usr CONFIGURE_ARGS = \ --target=$(GNU_TARGET_NAME) \ @@ -63,7 +65,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) \ @@ -71,8 +75,6 @@ CONFIGURE_VARS = \ CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ - PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \ - PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" CONFIGURE_PATH = . CONFIGURE_CMD = ./configure @@ -120,5 +122,13 @@ 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 + $(call Build/Compile/Default, DESTDIR="$(PKG_BUILD_DIR)/tmp" CC="$(TARGET_CC)" dist) +endef + +define Build/DistCheck/Default + $(call Build/Compile/Default, DESTDIR="$(PKG_BUILD_DIR)/tmp" CC="$(TARGET_CC)" distcheck) endef