build: Cleanup and fixes following previous commits.

* Hashing semantics for the new build repositories are different than
   the old ones, so update those (if the x86 build was not broken before
   it is now...)
 * OptionalPackages has been updated slightly (removed libtool and git_cvs
   from the default images, as they are rarely used nowadays and would pull
   in a bunch of dependencies we don't really care for either)
 * Removed lib:libqrencode from Haiku package requires (qrencode_kdl is a
   static library, the userland libqrencode is not used anywhere in the tree,
   as far as I can tell)
 * Fix build of JPEG2000 translator after update
 * Decouple fluidsynth build machinery and remove from image now that it
   is no longer used
 * Update repository URL in Repositories preflet
This commit is contained in:
Augustin Cavalier
2017-11-25 21:15:10 +01:00
parent 36f675968e
commit 5f8613a22c
11 changed files with 23 additions and 39 deletions
+6 -3
View File
@@ -160,9 +160,12 @@ rule RemotePackageRepository repository : architecture : repositoryUrl
# build package list checksum file
local packagesChecksumFile
= $(repository:G=repository-package-checksum)-checksum ;
local thisPackageRepositoryFile = [ Glob [ FDirName
$(HAIKU_BUILD_RULES_DIR) repositories HaikuPorts ] :
$(HAIKU_PACKAGING_ARCH) ] ;
MakeLocate $(packagesChecksumFile) : $(repositoriesDir) ;
Depends $(packagesChecksumFile) : $(packageListFile) ;
ChecksumFileSHA256 $(packagesChecksumFile) : $(packageListFile) ;
Depends $(packagesChecksumFile) : $(thisPackageRepositoryFile) ;
ChecksumFileSHA256 $(packagesChecksumFile) : $(thisPackageRepositoryFile) ;
local repositoryInfo = $(repository:G=repository-info)-info ;
local repositoryFile = $(repository:G=repository-cache) ;
@@ -260,7 +263,7 @@ actions RepositoryConfig1
version=`cat "$(2[3]:E)"`
fi
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
$(2[1]) $(HAIKU_REPOSITORY_URL) $(2[2]) $(1)
$(2[1]) $(2[2]) $(1)
}