ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-18 21:28:02 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

tools: add Host/Uninstall where possible

Browse Source 
This cleans staging_dir when calling tool/x/clean.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2022-09-28 01:23:56 -07:00 committed by Christian Marangi
parent f2ae4e2f8c
commit a63805b25f
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
26 changed files with 100 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/automake/Makefile
View File

@ -43,9 +43,8 @@ define Host/Install
ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.15 ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.15
endef endef
define Host/Clean define Host/Uninstall
-$(MAKE) -C $(HOST_BUILD_DIR) uninstall -$(call Host/Compile/Default,uninstall)
$(call Host/Clean/Default)
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/bash/Makefile
View File

@ -18,4 +18,8 @@ HOST_BUILD_PARALLEL := 1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/bc/Makefile
View File

@ -18,4 +18,8 @@ PKG_CPE_ID:=cpe:/a:gnu:bc
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

10
tools/bison/Makefile
View File

@ -19,14 +19,14 @@ include $(INCLUDE_DIR)/host-build.mk
HOST_CONFIGURE_ARGS += --enable-threads=posix --disable-nls 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 define Host/Install
$(call Host/Install/Default) $(call Host/Install/Default)
$(INSTALL_BIN) ./scripts/yacc $(STAGING_DIR_HOST)/bin/yacc $(INSTALL_BIN) ./scripts/yacc $(STAGING_DIR_HOST)/bin/yacc
endef endef
define Host/Uninstall
rm -f $(STAGING_DIR_HOST)/bin/yacc
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

5
tools/coreutils/Makefile
View File

@ -35,4 +35,9 @@ define Host/Install
ln -sf ginstall $(1)/bin/install ln -sf ginstall $(1)/bin/install
endef endef
define Host/Uninstall
rm -f $(STAGING_DIR_HOST)/bin/install
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/cpio/Makefile
View File

@ -11,4 +11,8 @@ PKG_HASH:=eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/dosfstools/Makefile
View File

@ -24,4 +24,8 @@ ifeq ($(HOST_OS),Darwin)
HOST_CFLAGS += -UHAVE_ENDIAN_H HOST_CFLAGS += -UHAVE_ENDIAN_H
endif endif
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/elfutils/Makefile
View File

@ -30,4 +30,8 @@ HOST_CONFIGURE_ARGS += \
HOST_MAKE_FLAGS += \ HOST_MAKE_FLAGS += \
SUBDIRS="lib libelf libcpu backends libebl libdwelf libdwfl libdw" SUBDIRS="lib libelf libcpu backends libebl libdwelf libdwfl libdw"
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/fakeroot/Makefile
View File

@ -25,4 +25,8 @@ HOST_CONFIGURE_VARS += \
HOST_CONFIGURE_ARGS += \ HOST_CONFIGURE_ARGS += \
--with-ipc=tcp --with-ipc=tcp
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/findutils/Makefile
View File

@ -28,4 +28,8 @@ HOST_CONFIGURE_ARGS += \
--disable-nls \ --disable-nls \
--without-selinux --without-selinux
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

6
tools/flex/Makefile
View File

@ -26,8 +26,12 @@ define Host/Install
$(LN) flex $(STAGING_DIR_HOST)/bin/lex $(LN) flex $(STAGING_DIR_HOST)/bin/lex
endef endef
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
define Host/Clean define Host/Clean
-$(MAKE) -C $(HOST_BUILD_DIR) uninstall rm -f $(STAGING_DIR_HOST)/bin/lex
$(call Host/Clean/Default) $(call Host/Clean/Default)
endef endef

4
tools/flock/Makefile
View File

@ -24,4 +24,8 @@ define Host/Install
$(INSTALL_BIN) $(HOST_BUILD_DIR)/flock $(STAGING_DIR_HOST)/bin/ $(INSTALL_BIN) $(HOST_BUILD_DIR)/flock $(STAGING_DIR_HOST)/bin/
endef endef
define Host/Clean
rm -f $(STAGING_DIR_HOST)/bin/flock
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/gmp/Makefile
View File

@ -31,4 +31,8 @@ ifeq ($(GNU_HOST_NAME),x86_64-linux-gnux32)
HOST_CONFIGURE_ARGS += ABI=x32 HOST_CONFIGURE_ARGS += ABI=x32
endif endif
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/isl/Makefile
View File

@ -24,4 +24,8 @@ HOST_CONFIGURE_ARGS += \
--disable-shared \ --disable-shared \
--with-gmp-prefix=$(STAGING_DIR_HOST) --with-gmp-prefix=$(STAGING_DIR_HOST)
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/libressl/Makefile
View File

@ -34,4 +34,8 @@ HOST_CONFIGURE_ARGS += \
--with-pic \ --with-pic \
--disable-tests --disable-tests
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

5
tools/libtool/Makefile
View File

@ -34,8 +34,11 @@ define Host/Install
$(SED) 's,-lstdc++,-luClibc++,g' $(STAGING_DIR_HOST)/bin/libtool-ucxx $(SED) 's,-lstdc++,-luClibc++,g' $(STAGING_DIR_HOST)/bin/libtool-ucxx
endef endef
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
define Host/Clean define Host/Clean
-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
$(call Host/Clean/Default) $(call Host/Clean/Default)
endef endef

1
tools/lzma/Makefile
View File

@ -31,6 +31,7 @@ define Host/Install
endef endef
define Host/Clean define Host/Clean
rm -f $(STAGING_DIR_HOST)/bin/lzma
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

5
tools/m4/Makefile
View File

@ -21,9 +21,8 @@ include $(INCLUDE_DIR)/host-build.mk
HOST_CONFIGURE_VARS += gl_cv_func_strstr_linear=no HOST_CONFIGURE_VARS += gl_cv_func_strstr_linear=no
define Host/Clean define Host/Uninstall
-$(MAKE) -C $(HOST_BUILD_DIR) uninstall -$(call Host/Compile/Default,uninstall)
$(call Host/Clean/Default)
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/mpc/Makefile
View File

@ -25,4 +25,8 @@ HOST_CONFIGURE_ARGS += \
--with-mpfr=$(TOPDIR)/staging_dir/host \ --with-mpfr=$(TOPDIR)/staging_dir/host \
--with-gmp=$(TOPDIR)/staging_dir/host --with-gmp=$(TOPDIR)/staging_dir/host
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/mpfr/Makefile
View File

@ -25,4 +25,8 @@ HOST_CONFIGURE_ARGS += \
--enable-thread-safe \ --enable-thread-safe \
--with-gmp=$(STAGING_DIR_HOST) --with-gmp=$(STAGING_DIR_HOST)
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/patch/Makefile
View File

@ -22,4 +22,8 @@ include $(INCLUDE_DIR)/host-build.mk
HOSTCC := $(HOSTCC_NOCACHE) HOSTCC := $(HOSTCC_NOCACHE)
HOSTCXX := $(HOSTCXX_NOCACHE) HOSTCXX := $(HOSTCXX_NOCACHE)
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/patchelf/Makefile
View File

@ -24,4 +24,8 @@ define Host/Install
$(INSTALL_BIN) $(HOST_BUILD_DIR)/src/patchelf $(STAGING_DIR_HOST)/bin/patchelf $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/patchelf $(STAGING_DIR_HOST)/bin/patchelf
endef endef
define Host/Clean
rm -rf $(STAGING_DIR_HOST)/bin/patchelf
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/sparse/Makefile
View File

@ -21,4 +21,8 @@ define Host/Install
$(INSTALL_BIN) $(HOST_BUILD_DIR)/sparse $(STAGING_DIR_HOST)/bin $(INSTALL_BIN) $(HOST_BUILD_DIR)/sparse $(STAGING_DIR_HOST)/bin
endef endef
define Host/Clean
rm -f $(STAGING_DIR_HOST)/bin/sparse
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/tar/Makefile
View File

@ -28,4 +28,8 @@ HOST_CONFIGURE_ARGS += \
--disable-acl \ --disable-acl \
--disable-nls --disable-nls
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
tools/xz/Makefile
View File

@ -33,4 +33,8 @@ define Host/Install
+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat" +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat"
endef endef
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

5
tools/zip/Makefile
View File

@ -32,5 +32,8 @@ define Host/Install
$(INSTALL_BIN) $(HOST_BUILD_DIR)/zip $(STAGING_DIR_HOST)/bin/ $(INSTALL_BIN) $(HOST_BUILD_DIR)/zip $(STAGING_DIR_HOST)/bin/
endef endef
define Host/Clean
rm -rf $(STAGING_DIR_HOST)/bin/zip
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))
#$(eval $(call BuildPackage,zip))