X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e87fb5ee5a75b03e8b2e128b611a72e08eab3196..d0c10785e702f0e56029aee4c4f8f9bfcf03a5e9:/include/package-defaults.mk diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 877fff833..700bc5b99 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) @@ -30,7 +30,9 @@ define Package/Default SUBMENU:= SUBMENUDEP:= TITLE:= - DESCRIPTION:= + KCONFIG:= + BUILDONLY:= + URL:= endef Build/Patch:=$(Build/Patch/Default) @@ -41,25 +43,23 @@ ifneq ($(strip $(PKG_UNPACK)),) endef endif -TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib - +CONFIGURE_PREFIX:=/usr CONFIGURE_ARGS = \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --program-prefix="" \ --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libexecdir=/usr/lib \ + --prefix=$(CONFIGURE_PREFIX) \ + --exec-prefix=$(CONFIGURE_PREFIX) \ + --bindir=$(CONFIGURE_PREFIX)/bin \ + --sbindir=$(CONFIGURE_PREFIX)/sbin \ + --libexecdir=$(CONFIGURE_PREFIX)/lib \ --sysconfdir=/etc \ - --datadir=/usr/share \ + --datadir=$(CONFIGURE_PREFIX)/share \ --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ + --mandir=$(CONFIGURE_PREFIX)/man \ + --infodir=$(CONFIGURE_PREFIX)/info \ $(DISABLE_NLS) CONFIGURE_VARS = \ @@ -67,17 +67,18 @@ CONFIGURE_VARS = \ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ - PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" + LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ CONFIGURE_PATH = . CONFIGURE_CMD = ./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) \ @@ -88,15 +89,19 @@ define Build/Configure/Default endef MAKE_VARS = \ - CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ - CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ - LDFLAGS="$(EXTRA_LDFLAGS) " + CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ + CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" MAKE_FLAGS = \ $(TARGET_CONFIGURE_OPTS) \ CROSS="$(TARGET_CROSS)" \ ARCH="$(ARCH)" +MAKE_INSTALL_FLAGS = \ + $(MAKE_FLAGS) \ + DESTDIR="$(PKG_INSTALL_DIR)" + MAKE_PATH = . define Build/Compile/Default @@ -106,4 +111,9 @@ define Build/Compile/Default $(1); endef - +define Build/Install/Default + $(MAKE_VARS) \ + $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ + $(MAKE_INSTALL_FLAGS) \ + $(1) install; +endef