X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8e52b00c08077ea9d8a8c7dac30be9c98d0ad833..6acfb9dbbf62a2a464f7fb8d9a7e2f0550c0ffcc:/include/package-defaults.mk diff --git a/include/package-defaults.mk b/include/package-defaults.mk index e375722af..2b5cb8671 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -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:= @@ -43,9 +47,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 +64,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 +74,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 @@ -122,3 +123,11 @@ define Build/Install/Default $(MAKE_INSTALL_FLAGS) \ $(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