mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-10-31 05:54:26 -04:00 
			
		
		
		
	tools: add Host/Uninstall where possible
This cleans staging_dir when calling tool/x/clean. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
		
							parent
							
								
									f2ae4e2f8c
								
							
						
					
					
						commit
						a63805b25f
					
				| @ -43,9 +43,8 @@ define Host/Install | ||||
| 	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.15 | ||||
| endef | ||||
| 
 | ||||
| define Host/Clean | ||||
| 	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall | ||||
| 	$(call Host/Clean/Default) | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -18,4 +18,8 @@ HOST_BUILD_PARALLEL := 1 | ||||
| 
 | ||||
| include $(INCLUDE_DIR)/host-build.mk | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -18,4 +18,8 @@ PKG_CPE_ID:=cpe:/a:gnu:bc | ||||
| 
 | ||||
| include $(INCLUDE_DIR)/host-build.mk | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -19,14 +19,14 @@ include $(INCLUDE_DIR)/host-build.mk | ||||
| 
 | ||||
| HOST_CONFIGURE_ARGS += --enable-threads=posix --disable-nls | ||||
| 
 | ||||
| define Host/Clean | ||||
| 	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall | ||||
| 	$(call Host/Clean/Default) | ||||
| endef | ||||
| 
 | ||||
| define Host/Install | ||||
| 	$(call Host/Install/Default) | ||||
| 	$(INSTALL_BIN) ./scripts/yacc $(STAGING_DIR_HOST)/bin/yacc | ||||
| endef | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	rm -f $(STAGING_DIR_HOST)/bin/yacc | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -35,4 +35,9 @@ define Host/Install | ||||
| 	ln -sf ginstall $(1)/bin/install | ||||
| endef | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	rm -f $(STAGING_DIR_HOST)/bin/install | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -11,4 +11,8 @@ PKG_HASH:=eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d | ||||
| 
 | ||||
| include $(INCLUDE_DIR)/host-build.mk | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -24,4 +24,8 @@ ifeq ($(HOST_OS),Darwin) | ||||
| HOST_CFLAGS += -UHAVE_ENDIAN_H | ||||
| endif | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -30,4 +30,8 @@ HOST_CONFIGURE_ARGS += \ | ||||
| HOST_MAKE_FLAGS += \
 | ||||
| 	SUBDIRS="lib libelf libcpu backends libebl libdwelf libdwfl libdw" | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -25,4 +25,8 @@ HOST_CONFIGURE_VARS += \ | ||||
| HOST_CONFIGURE_ARGS += \
 | ||||
| 	--with-ipc=tcp | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -28,4 +28,8 @@ HOST_CONFIGURE_ARGS += \ | ||||
| 	--disable-nls \
 | ||||
| 	--without-selinux | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -26,8 +26,12 @@ define Host/Install | ||||
| 	$(LN) flex $(STAGING_DIR_HOST)/bin/lex | ||||
| endef | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| define Host/Clean | ||||
| 	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall | ||||
| 	rm -f $(STAGING_DIR_HOST)/bin/lex | ||||
| 	$(call Host/Clean/Default) | ||||
| endef | ||||
| 
 | ||||
|  | ||||
| @ -24,4 +24,8 @@ define Host/Install | ||||
| 	$(INSTALL_BIN) $(HOST_BUILD_DIR)/flock $(STAGING_DIR_HOST)/bin/ | ||||
| endef | ||||
| 
 | ||||
| define Host/Clean | ||||
| 	rm -f $(STAGING_DIR_HOST)/bin/flock | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -31,4 +31,8 @@ ifeq ($(GNU_HOST_NAME),x86_64-linux-gnux32) | ||||
| HOST_CONFIGURE_ARGS += ABI=x32 | ||||
| endif | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -24,4 +24,8 @@ HOST_CONFIGURE_ARGS += \ | ||||
| 	--disable-shared \
 | ||||
| 	--with-gmp-prefix=$(STAGING_DIR_HOST) | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -34,4 +34,8 @@ HOST_CONFIGURE_ARGS += \ | ||||
| 	--with-pic \
 | ||||
| 	--disable-tests | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -34,8 +34,11 @@ define Host/Install | ||||
| 	$(SED) 's,-lstdc++,-luClibc++,g' $(STAGING_DIR_HOST)/bin/libtool-ucxx | ||||
| endef | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| define Host/Clean | ||||
| 	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall | ||||
| 	$(call Host/Clean/Default) | ||||
| endef | ||||
| 
 | ||||
|  | ||||
| @ -31,6 +31,7 @@ define Host/Install | ||||
| endef | ||||
| 
 | ||||
| define Host/Clean | ||||
| 	rm -f $(STAGING_DIR_HOST)/bin/lzma | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -21,9 +21,8 @@ include $(INCLUDE_DIR)/host-build.mk | ||||
| 
 | ||||
| HOST_CONFIGURE_VARS += gl_cv_func_strstr_linear=no | ||||
| 
 | ||||
| define Host/Clean | ||||
| 	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall | ||||
| 	$(call Host/Clean/Default) | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -25,4 +25,8 @@ HOST_CONFIGURE_ARGS += \ | ||||
| 	--with-mpfr=$(TOPDIR)/staging_dir/host \
 | ||||
| 	--with-gmp=$(TOPDIR)/staging_dir/host | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -25,4 +25,8 @@ HOST_CONFIGURE_ARGS += \ | ||||
| 	--enable-thread-safe \
 | ||||
| 	--with-gmp=$(STAGING_DIR_HOST) | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -22,4 +22,8 @@ include $(INCLUDE_DIR)/host-build.mk | ||||
| HOSTCC := $(HOSTCC_NOCACHE) | ||||
| HOSTCXX := $(HOSTCXX_NOCACHE) | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -24,4 +24,8 @@ define Host/Install | ||||
| 	$(INSTALL_BIN) $(HOST_BUILD_DIR)/src/patchelf $(STAGING_DIR_HOST)/bin/patchelf | ||||
| endef | ||||
| 
 | ||||
| define Host/Clean | ||||
| 	rm -rf $(STAGING_DIR_HOST)/bin/patchelf | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -21,4 +21,8 @@ define Host/Install | ||||
|        $(INSTALL_BIN) $(HOST_BUILD_DIR)/sparse $(STAGING_DIR_HOST)/bin | ||||
| endef | ||||
| 
 | ||||
| define Host/Clean | ||||
| 	rm -f $(STAGING_DIR_HOST)/bin/sparse | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -28,4 +28,8 @@ HOST_CONFIGURE_ARGS += \ | ||||
| 	--disable-acl \
 | ||||
| 	--disable-nls | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -33,4 +33,8 @@ define Host/Install | ||||
| 	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat" | ||||
| endef | ||||
| 
 | ||||
| define Host/Uninstall | ||||
| 	-$(call Host/Compile/Default,uninstall) | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
|  | ||||
| @ -32,5 +32,8 @@ define Host/Install | ||||
| 	$(INSTALL_BIN) $(HOST_BUILD_DIR)/zip $(STAGING_DIR_HOST)/bin/ | ||||
| endef | ||||
| 
 | ||||
| define Host/Clean | ||||
| 	rm -rf $(STAGING_DIR_HOST)/bin/zip | ||||
| endef | ||||
| 
 | ||||
| $(eval $(call HostBuild)) | ||||
| #$(eval $(call BuildPackage,zip))
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user