i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build/jam: Inline HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR where possible.

Browse Source 
The "exec" tool can only handle one command with environs set at
the beginning of the line, so now we set the ADD_BUILD_COMPAT...
in this format. This also seems to be a general performance
improvement to builds using real shells, too.

Change-Id: If4b3117651b5475039d5e8116cd3de398582290a
This commit is contained in:
Augustin Cavalier
2019-08-30 17:11:50 -04:00
parent 12eb0e5d89
commit 128781e740
16 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/RepositoryRules
+5 -5
View File
@@ -256,7 +256,7 @@ actions RepositoryConfig1
if [ -n "$(2[3]:E)" ]; then
version=`cat "$(2[3]:E)"`
fi
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) $(2[2]) $(1)
}
@@ -272,7 +272,7 @@ rule RepositoryCache repoCache : repoInfo : packageFiles
actions RepositoryCache1
{
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(2[1]) create -q $(2[2-])
mv $(1:B=repo) $(1)
}
@@ -362,7 +362,7 @@ actions BootstrapRepositoryFetchPackage1
cd $(HAIKU_REPOSITORY_BUILD_DIRECTORY)
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
if [ -n "$secondaryCrossDevelPackages" ]; then
$(HOST_HAIKU_PORTER) -j$(HAIKU_PORTER_CONCURRENT_JOBS) \
--all-dependencies $(HAIKU_PORTER_EXTRA_OPTIONS) \
@@ -665,7 +665,7 @@ actions BuildHaikuPortsSourcePackageDirectory1
cd $(HAIKU_REPOSITORY_BUILD_DIRECTORY)
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
if [ -n "$secondaryCrossDevelPackages" ]; then
$(HOST_HAIKU_PORTER) --cross-devel-package "$haikuCrossDevelPackage" \
"$secondaryCrossDevelPackages" \
@@ -763,7 +763,7 @@ rule HaikuRepository repository : repoInfoTemplate : packages
local script = $(initVariablesScript) ;
AddVariableToScript $(script) : addBuildCompatibilityLibDir
: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
: "export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)" ;
AddVariableToScript $(script) : sha256 : $(HOST_SHA256) ;
AddVariableToScript $(script) : sedExtendedRegex
: $(HOST_EXTENDED_REGEX_SED) ;