Changeset 3496

Timestamp:

Jun 19, 2007, 2:01:54 AM (18 years ago)

Author:

bird

Message:

Optimized it so it's possible to get some work done.

File:

• trunk/essentials/sys-apps/prefix-portage/kNIX-bootstrap.kmk (modified) (1 diff)

trunk/essentials/sys-apps/prefix-portage/kNIX-bootstrap.kmk

@@ -29 +29 @@
 
 #
-# First, a couple of templates so we can use the subst-install script.
+# First, a couple of templates so we can emulate the subst-install script.
+# (This is 10x faster then subst-install.)
 #
 TEMPLATE_portagedata = portage data.
 TEMPLATE_portagedata_EXTENDS = gendata
 # 1: source  2: destination, 3: target
-TEMPLATE_portagedata_INSTALLER = $(ASH) $(PATH_TARGET)/subst-install \
-        "--installcmd=$(INSTALL_EXT)$(if $(mode), -m $(mode))$(if $(uid),-o $(uid))$(if $(gid),-g $(gid))" $1 $2
-TEMPLATE_portagedata_ORDERDEPS = \
-        $(PATH_TARGET)/subst-install.sh \
-        $(PATH_TARGET)/subst-install.vars
+define TEMPLATE_portagedata_INSTALLER
+        $(SED) -f $(PATH_TARGET)/subst-install.sed $1 > $(PATH_TARGET)/subst-install.tmp
+        $(QUIET)$(INSTALL) $$(if $(mode), -m $(mode)) $$(if $(uid),-o $(uid)) $$(if $(gid),-g $(gid)) $(PATH_TARGET)/subst-install.tmp $2
+        $(QUIET)$(RM) -f -- $(PATH_TARGET)/subst-install.tmp
+endef
+TEMPLATE_portagedata_DEPS = \
+        $(PATH_TARGET)/subst-install.sed
 
 TEMPLATE_portagescript = portage data.
 TEMPLATE_portagescript_EXTENDS = genscript
-# 1: source  2: destination, 3: target
-TEMPLATE_portagescript_INSTALLER = $(ASH) $(PATH_TARGET)/subst-install \
-        "--installcmd=$(INSTALL_EXT)$(if $(mode), -m $(mode))$(if $(uid),-o $(uid))$(if $(gid),-g $(gid))" $1 $2
-TEMPLATE_portagescript_ORDERDEPS = \
-        $(PATH_TARGET)/subst-install.sh \
-        $(PATH_TARGET)/subst-install.vars
-
-$(PATH_TARGET)/subst-install: subst-install.in | $$(call DIRDEP,$$(@D))
-        $(INSTALL) -m 0775 $^ $@
-
-$(PATH_TARGET)/subst-install.vars: kNIX-bootstrap-os2.x86-subst-install.vars | $$(call DIRDEP,$$(@D))
-        $(INSTALL) -m 0664 $^ $@
+TEMPLATE_portagescript_INSTALLER = $(TEMPLATE_portagedata_INSTALLER)
+TEMPLATE_portagescript_DEPS = $(TEMPLATE_portagedata_ORDERDEPS)
+
+# Generate the sed installer script. 
+$(PATH_TARGET)/subst-install.sed: kNIX-bootstrap-os2.x86-subst-install.vars kNIX-bootstrap-vars2sed.sed | $$(call DIRDEP,$$(@D))
+        $(RM) -f $@
+        $(SED) -f kNIX-bootstrap-vars2sed.sed $< > $@
 
 # temporary hack while ORDERDEPS doesn't work on INSTALLS.
-OTHERS += $(PATH_TARGET)/subst-install.vars $(PATH_TARGET)/subst-install
-OTHERS_CLEAN += $(PATH_TARGET)/subst-install.vars $(PATH_TARGET)/subst-install
+OTHERS += $(PATH_TARGET)/subst-install.sed
+OTHER_CLEAN += $(PATH_TARGET)/subst-install.sed