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

BootstrapPackageRepository: serialize package creation

Browse Source 
Since haikuporter uses a common directory for building the ports, we
can't build them concurrently. This makes jamming with multiple jobs
safe again.
This commit is contained in:
Ingo Weinhold
2013-07-21 19:39:40 +02:00
parent a7ab22a0c0
commit 7b2174a27d
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/RepositoryRules
+30 -10
View File
@@ -247,14 +247,19 @@ rule BootstrapRepositoryFetchPackage repository : package : fileName
return $(HAIKU_REPOSITORY_HAIKU_CROSS_DEVEL_PACKAGE) ] ; return $(HAIKU_REPOSITORY_HAIKU_CROSS_DEVEL_PACKAGE) ] ;
local packageFile = <cross-built>$(fileName) ; local packageFile = <cross-built>$(fileName) ;
if [ on $(packageFile) return $(HAIKU_REPOSITORY_BUILD_DIRECTORY) ] {
# rule already called for this package
return $(packageFile) ;
}
HAIKU_REPOSITORY_BUILD_DIRECTORY on $(packageFile) = $(outputDir) ;
MakeLocate $(packageFile) : [ FDirName $(outputDir) packages ] ; MakeLocate $(packageFile) : [ FDirName $(outputDir) packages ] ;
NoUpdate $(packageFile) ; NoUpdate $(packageFile) ;
# Don't rebuild the file. Since the haiku cross devel package is # Don't rebuild the file. Since the haiku cross devel package is
# a dependency and is updated always, this package would otherwise be # a dependency and is updated always, this package would otherwise be
# rebuilt always as well. # rebuilt always as well.
HAIKU_REPOSITORY_BUILD_DIRECTORY on $(packageFile) = $(outputDir) ;
Depends $(packageFile) : $(haikuCrossDevelPackage) $(configFile) ; Depends $(packageFile) : $(haikuCrossDevelPackage) $(configFile) ;
BootstrapRepositoryFetchPackage1 $(packageFile) BootstrapRepositoryFetchPackage1 $(packageFile)
: $(haikuCrossDevelPackage) ; : $(haikuCrossDevelPackage) ;
@@ -332,19 +337,20 @@ rule BootstrapPackageRepository repository : architecture
: BootstrapRepositoryFetchPackage ; : BootstrapRepositoryFetchPackage ;
# register repository with stage 1 packages # register repository with stage 1 packages
local packageTargets = [ PackageRepository $(repository) : $(architecture) local stage1PackageTargets = [ PackageRepository $(repository)
: $(anyPackages) : $(packagesStage1) : $(sourcePackages) : $(architecture) : $(anyPackages) : $(packagesStage1)
: $(debugInfoPackages) ] ; : $(sourcePackages) : $(debugInfoPackages) ] ;
if ! $(packageTargets) { if ! $(stage1PackageTargets) {
return ; return ;
} }
HAIKU_REPOSITORY_HAIKU_CROSS_DEVEL_PACKAGE on $(packageTargets) HAIKU_REPOSITORY_HAIKU_CROSS_DEVEL_PACKAGE on $(stage1PackageTargets)
= haiku_cross_devel_sysroot_stage1_$(HAIKU_PACKAGING_ARCH).hpkg ; = haiku_cross_devel_sysroot_stage1_$(HAIKU_PACKAGING_ARCH).hpkg ;
# add stage 2 packages # add stage 2 packages
packageTargets = [ AddRepositoryPackages $(repository) : $(architecture) local stage2PackageTargets = [ AddRepositoryPackages $(repository)
: $(packagesStage2) : $(sourcePackages) : $(debugInfoPackages) ] ; : $(architecture) : $(packagesStage2) : $(sourcePackages)
HAIKU_REPOSITORY_HAIKU_CROSS_DEVEL_PACKAGE on $(packageTargets) : $(debugInfoPackages) ] ;
HAIKU_REPOSITORY_HAIKU_CROSS_DEVEL_PACKAGE on $(stage2PackageTargets)
= haiku_cross_devel_sysroot_$(HAIKU_PACKAGING_ARCH).hpkg ; = haiku_cross_devel_sysroot_$(HAIKU_PACKAGING_ARCH).hpkg ;
# prepare the config file for the HaikuPorts cross build # prepare the config file for the HaikuPorts cross build
@@ -361,6 +367,20 @@ rule BootstrapPackageRepository repository : architecture
HAIKU_REPOSITORY_BUILD_CONFIG_FILE on $(repository) = $(configFile) ; HAIKU_REPOSITORY_BUILD_CONFIG_FILE on $(repository) = $(configFile) ;
HAIKU_REPOSITORY_BUILD_DIRECTORY on $(repository) = $(outputDir) ; HAIKU_REPOSITORY_BUILD_DIRECTORY on $(repository) = $(outputDir) ;
# Serialize all package file targets. We need to do this, since
# haikuporter uses a common directory for building the ports, so building
# two ports concurrently isn't possible.
local previousPackageFile ;
local package ;
for package in $(stage1PackageTargets) $(stage2PackageTargets) {
local fileName = [ on $(package) return $(HAIKU_PACKAGE_FILE_NAME) ] ;
local packageFile = [ BootstrapRepositoryFetchPackage $(repository)
: $(package) : $(fileName) ] ;
Depends $(packageFile) : $(previousPackageFile) ;
previousPackageFile = $(packageFile) ;
}
} }