X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/36b99718212dde5ae1d17ec04268fbe24b72b1de..5944a256288df387a8b48c4ad0622c88181f32cd:/include/package-defaults.mk diff --git a/include/package-defaults.mk b/include/package-defaults.mk index d72e02b1e..1553f2f0d 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) @@ -31,6 +31,8 @@ define Package/Default SUBMENUDEP:= TITLE:= KCONFIG:= + BUILDONLY:= + URL:= endef Build/Patch:=$(Build/Patch/Default) @@ -38,13 +40,9 @@ ifneq ($(strip $(PKG_UNPACK)),) define Build/Prepare/Default $(PKG_UNPACK) $(Build/Patch) - $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used) 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) \ @@ -70,16 +68,17 @@ 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 +CONFIGURE_CMD = $(CONFIGURE_PATH)/configure + +replace_script=$(FIND) $(1) -name $(2) | $(XARGS) chmod u+w; $(FIND) $(1) -name $(2) | $(XARGS) -n1 cp $(SCRIPT_DIR)/$(2); define Build/Configure/Default (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \ if [ -x $(CONFIGURE_CMD) ]; then \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/$(3)/ && \ + $(call replace_script,$(PKG_BUILD_DIR)/$(3),config.guess) \ + $(call replace_script,$(PKG_BUILD_DIR)/$(3),config.sub) \ $(CONFIGURE_VARS) \ $(2) \ $(CONFIGURE_CMD) \ @@ -99,6 +98,10 @@ MAKE_FLAGS = \ CROSS="$(TARGET_CROSS)" \ ARCH="$(ARCH)" +MAKE_INSTALL_FLAGS = \ + $(MAKE_FLAGS) \ + DESTDIR="$(PKG_INSTALL_DIR)" + MAKE_PATH = . define Build/Compile/Default @@ -107,3 +110,18 @@ define Build/Compile/Default $(MAKE_FLAGS) \ $(1); endef + +define Build/Install/Default + $(MAKE_VARS) \ + $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ + $(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