diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-20 00:16:45 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-20 00:16:45 +0100 |
| commit | 8d6de9990ea0098f0932f4bfe64c331b67a9a40e (patch) | |
| tree | 1debd47a689c93bfd5dae1b7f234fe0120e2a99c | |
| parent | bcd130f15376964f63bd9f88c24d30ae3cb14432 (diff) | |
convert to HOST_STYLE auto, add hostclean target
| -rw-r--r-- | mk/host-bottom.mk | 4 | ||||
| -rw-r--r-- | mk/host.mk | 4 | ||||
| -rw-r--r-- | mk/package.mk | 2 | ||||
| -rw-r--r-- | package/ncurses/Makefile | 6 |
4 files changed, 9 insertions, 7 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 19b43b081..43a622c0f 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -102,3 +102,7 @@ ifeq ($(HOST_LINUX_ONLY),) hostpackage: ${ALL_HOSTDIRS} @touch ${_HOST_COOKIE} endif + +hostclean: + @$(CMD_TRACE) "cleaning... " + rm -rf ${WRKDIR} ${STAGING_PKG_DIR}/stamps/${PKG_NAME}*-host diff --git a/mk/host.mk b/mk/host.mk index ce41a7d7d..5f9539aef 100644 --- a/mk/host.mk +++ b/mk/host.mk @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. # This is where all package operation is done in -ifneq (,$(findstring hostpackage,$(MAKECMDGOALS))) +ifneq (,$(findstring host,$(MAKECMDGOALS))) WRKDIR?= ${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host endif @@ -68,4 +68,4 @@ $$(HOSTDIR_$(1)): ${_HOST_PATCH_COOKIE} ${_HOST_FAKE_COOKIE} endef .PHONY: all hostextract hostpatch hostconfigure \ - hostbuild hostpackage hostfake + hostbuild hostpackage hostfake hostclean diff --git a/mk/package.mk b/mk/package.mk index a70de9377..ed94e3539 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -314,7 +314,7 @@ clean-targets: clean: @$(CMD_TRACE) "cleaning... " @$(MAKE) clean-targets $(MAKE_TRACE) - rm -rf ${WRKDIR} ${ALL_IPKGS} ${STAGING_PKG_DIR}/stamps/${PKG_NAME}* + rm -rf ${WRKDIR} ${ALL_IPKGS} ${STAGING_PKG_DIR}/stamps/${PKG_NAME}${PKG_VERSION} distclean: clean rm -f ${FULLDISTFILES} diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 779ebfbdd..6b193dc12 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ncurses PKG_VERSION:= 5.9 -PKG_RELEASE:= 4 +PKG_RELEASE:= 5 PKG_MD5SUM:= 8cb9c412e5f2d96bc6f459aa8c6282a1 PKG_DESCR:= a terminal handling library PKG_SECTION:= libs @@ -50,6 +50,7 @@ CONFIGURE_ARGS+= --without-cxx \ ALL_TARGET:= libs INSTALL_TARGET:= install.libs install.data +HOST_STYLE:= auto # use sth which does not exist HOST_ALL_TARGET:= progs HOST_INSTALL_TARGET:= install.includes install.progs @@ -69,9 +70,6 @@ HOST_CONFIGURE_ARGS+= --without-shared \ --without-debug \ --without-profile -libncurses-hostinstall: - ${CP} ${HOST_WRKINST}/usr/bin/* ${STAGING_HOST_DIR}/usr/bin - libncurses-install: rm -rf ${WRKINST}/usr/lib/terminfo # this is installed as libncurses - make libcurses a "link" |